diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/env/src/main/java/org/onap/aaf/misc/env/BaseDataFactory.java | 4 | ||||
| -rw-r--r-- | misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/InXML.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/BaseDataFactory.java b/misc/env/src/main/java/org/onap/aaf/misc/env/BaseDataFactory.java index 4750b3ef..4dfa26b6 100644 --- a/misc/env/src/main/java/org/onap/aaf/misc/env/BaseDataFactory.java +++ b/misc/env/src/main/java/org/onap/aaf/misc/env/BaseDataFactory.java @@ -54,7 +54,7 @@ import org.xml.sax.SAXException; * @param <T> */ public class BaseDataFactory { - + private static final Object LOCK = new Object(); /** * Generate a Schema Object for use in validation based on FileNames. * @@ -88,7 +88,7 @@ public class BaseDataFactory { } try { //Note: SchemaFactory is not reentrant or very thread safe either... see docs - synchronized(XMLConstants.W3C_XML_SCHEMA_NS_URI) { // SchemaFactory is not reentrant + synchronized(LOCK) { // SchemaFactory is not reentrant return SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI) .newSchema(sources); } diff --git a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/InXML.java b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/InXML.java index 51926573..48275926 100644 --- a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/InXML.java +++ b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/InXML.java @@ -96,6 +96,8 @@ public class InXML implements Parse<Reader, State> { sb.append(c); } else if(c=='&') { XmlEscape.xmlEscape(sb,r); + } else if(c=='\\') { + escaped=true; } else { switch(c) { case '<': |