sandygao    2003/01/28 06:03:36

  Modified:    java/src/org/apache/xerces/impl XMLEntityManager.java
  Log:
  With the "XMLResourceIdentifier" interface being read/write now, we can
  write directly to it, instead of finding an instance of XMLResourceIdentifierImpl.
  
  Revision  Changes    Path
  1.60      +4 -11     xml-xerces/java/src/org/apache/xerces/impl/XMLEntityManager.java
  
  Index: XMLEntityManager.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLEntityManager.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- XMLEntityManager.java     16 Jan 2003 23:03:07 -0000      1.59
  +++ XMLEntityManager.java     28 Jan 2003 14:03:35 -0000      1.60
  @@ -688,16 +688,9 @@
          // give the entity resolver a chance
           XMLInputSource xmlInputSource = null;
           if (fEntityResolver != null) {
  -            XMLResourceIdentifierImpl ri = null;
  -            if (resourceIdentifier instanceof XMLResourceIdentifierImpl) {
  -                ri = (XMLResourceIdentifierImpl)resourceIdentifier;
  -            }
  -            else {
  -                fResourceIdentifier.clear();
  -                ri = fResourceIdentifier;
  -            }
  -            ri.setValues(publicId, literalSystemId, baseSystemId, expandedSystemId);
  -            xmlInputSource = fEntityResolver.resolveEntity(ri);
  +            resourceIdentifier.setBaseSystemId(baseSystemId);
  +            resourceIdentifier.setExpandedSystemId(expandedSystemId);
  +            xmlInputSource = fEntityResolver.resolveEntity(resourceIdentifier);
           }
   
           // do default resolution
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to