garyp 01/06/14 22:31:48 Modified: java/src/org/apache/xml/dtm/ref DTMManagerDefault.java Log: Resolved bugzilla bug 1830 (http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1830). The EntityResolver in the primary XMLReader was not being propagated to the XMLReader created to handle the document() function. The routine to construct the new XMLReader now obtains the most recently used EntityResolver for this DTMManager, if any, and carries that over to the new XMLReader. Revision Changes Path 1.5 +15 -0 xml-xalan/java/src/org/apache/xml/dtm/ref/DTMManagerDefault.java Index: DTMManagerDefault.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMManagerDefault.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DTMManagerDefault.java 2001/06/15 05:15:06 1.4 +++ DTMManagerDefault.java 2001/06/15 05:31:48 1.5 @@ -137,6 +137,11 @@ new ExpandedNameTable(); /** + * The most recent EntityResolver used. + */ + private EntityResolver m_lastEntityResolver; + + /** * Constructor DTMManagerDefault * */ @@ -526,6 +531,16 @@ // What can we do? // TODO: User diagnostics. + } + + EntityResolver currentEntityResolver = reader.getEntityResolver(); + if (null != currentEntityResolver) + { + m_lastEntityResolver = currentEntityResolver; + } + else if (null != m_lastEntityResolver) + { + reader.setEntityResolver(m_lastEntityResolver); } return reader;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
