Revert "Merge pull request #56 from ppkarwasz/master"

This reverts commit 9a029af, reversing
changes made to fb382fd.

src/main/java/org/apache/log4j/xml/DOMConfigurator.java

@@ -788,16 +788,6 @@ public String toString() {
 	doConfigure(action, repository);
     }
 
-    private final void setFeature(final DocumentBuilderFactory dbf, final String feature, final boolean value) {
-	try {
-	    dbf.setFeature(feature, value);
-	} catch (Exception e) {
-	    LogLog.warn("Failed to set DocumentBuilderFactory feature " + feature + ".", e);
-	} catch (AbstractMethodError e) {
-	    LogLog.warn("Failed to set DocumentBuilderFactory feature " + feature + ". Missing DocumentBuilderFactory.setFeature() method?", e);
-	}
-    }
-
     private final void doConfigure(final ParseAction action, final LoggerRepository repository)
 	    throws FactoryConfigurationError {
 	DocumentBuilderFactory dbf = null;
@@ -816,8 +806,8 @@ private final void doConfigure(final ParseAction action, final LoggerRepository
 	try {
 	    dbf.setValidating(true);
 	    // prevent XXE attacks
-	    setFeature(dbf, "http://xml.org/sax/features/external-general-entities", false);
-	    setFeature(dbf, "http://xml.org/sax/features/external-parameter-entities", false);
+	    dbf.setFeature("http://xml.org/sax/features/external-general-entities", false);
+	    dbf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
 
 	    DocumentBuilder docBuilder = dbf.newDocumentBuilder();
 
@@ -831,6 +821,9 @@ private final void doConfigure(final ParseAction action, final LoggerRepository
 		Thread.currentThread().interrupt();
 	    }
 	    LogLog.error("Could not parse " + action.toString() + ".", e);
+	} catch (AbstractMethodError e) {
+	    LogLog.error("Failed to parse XML file. Missing DocumentBuilderFactory.setFeature() method?", e);
+	    throw e;
 	}
     }