GEODE 3306: Unset system properties after parsing

apache · Aug 3, 2017 · 64d46b0 · 64d46b0
1 parent 0a9c318
commit 64d46b0
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/...-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java b/...-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
@@ -128,9 +128,16 @@ public void testCacheXmlParserWithSimplePool() {
    */
   @Test
   public void testCacheXmlParserWithSimplePoolXerces() {
-    System.setProperty("javax.xml.parsers.SAXParserFactory",
+    String prevParserFactory = System.setProperty("javax.xml.parsers.SAXParserFactory",
         "org.apache.xerces.jaxp.SAXParserFactoryImpl");
+
     testCacheXmlParserWithSimplePool();
+
+    if (prevParserFactory != null) {
+      System.setProperty("javax.xml.parsers.SAXParserFactory", prevParserFactory);
+    } else {
+      System.clearProperty("javax.xml.parsers.SAXParserFactory");
+    }
   }
 
   /**
@@ -161,9 +168,16 @@ public void testDTDFallbackWithNonEnglishLocal() {
    */
   @Test
   public void testDTDFallbackWithNonEnglishLocalXerces() {
-    System.setProperty("javax.xml.parsers.SAXParserFactory",
+    String prevParserFactory = System.setProperty("javax.xml.parsers.SAXParserFactory",
         "org.apache.xerces.jaxp.SAXParserFactoryImpl");
+
     testDTDFallbackWithNonEnglishLocal();
+
+    if (prevParserFactory != null) {
+      System.setProperty("javax.xml.parsers.SAXParserFactory", prevParserFactory);
+    } else {
+      System.clearProperty("javax.xml.parsers.SAXParserFactory");
+    }
   }
 
   /**