Reverted r19926 based on reports it breaks thin...

Reverted r19926 based on reports it breaks things under java7 and on
android. Ticket #2725 patiently awaits a real XML person. No review.

1 files changed, 3 insertions, 7 deletions

diff --git a/src/library/scala/xml/factory/XMLLoader.scala b/src/library/scala/xml/factory/XMLLoader.scala
index 3945e7cfda..006edca054 100644
--- a/src/library/scala/xml/factory/XMLLoader.scala
+++ b/src/library/scala/xml/factory/XMLLoader.scala
@@ -23,17 +23,13 @@ trait XMLLoader[T <: Node]
   import scala.xml.Source._
   def adapter: FactoryAdapter = new NoBindingFactoryAdapter()
 
-  private val saxFactory = {
+  /* Override this to use a different SAXParser. */
+  def parser: SAXParser = {
     val f = SAXParserFactory.newInstance()
     f.setNamespaceAware(false)
-    // Discovered at: http://www.jdom.org/docs/faq.html#a0350 (see ticket #2725)
-    f.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
-    f
+    f.newSAXParser()
   }
 
-  /* Override this to use a different SAXParser. */
-  def parser: SAXParser = saxFactory.newSAXParser()
-
   /** Loads XML from the given InputSource, using the supplied parser.
    *  The methods available in scala.xml.XML use the XML parser in the JDK.
    */