sandygao    2002/11/11 07:24:43

  Modified:    java/src/org/apache/xerces/impl/xs/traversers
                        XSDHandler.java
  Log:
  As pointed out by Katarzyna Marszalek, we didn't propagate the entity resolver
  (that's set on the document parser) to the schema parser (a DOM parser that's
  used to parse the schema documents). Fixed now.
  
  Revision  Changes    Path
  1.57      +11 -1     
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
  
  Index: XSDHandler.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- XSDHandler.java   8 Oct 2002 21:45:45 -0000       1.56
  +++ XSDHandler.java   11 Nov 2002 15:24:43 -0000      1.57
  @@ -135,6 +135,10 @@
       protected static final String JAXP_SCHEMA_SOURCE =
           Constants.JAXP_PROPERTY_PREFIX + Constants.SCHEMA_SOURCE;
   
  +    /** Property identifier: entity resolver. */
  +    public static final String ENTITY_RESOLVER =
  +    Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_RESOLVER_PROPERTY;
  +
       protected static final boolean DEBUG_NODE_POOL = false;
                                 
       // Data
  @@ -1515,6 +1519,12 @@
               }
               try {
                   fSchemaParser.setFeature(ALLOW_JAVA_ENCODINGS, fAllowJavaEncodings);
  +            } catch (Exception e) {
  +            }
  +            try {
  +                if (fEntityResolver != fSchemaParser.getProperty(ENTITY_RESOLVER)) {
  +                    fSchemaParser.setProperty(ENTITY_RESOLVER, fEntityResolver);
  +                }
               } catch (Exception e) {
               }
           }
  
  
  

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

Reply via email to