mrglavas    2005/05/11 10:41:43

  Modified:    java/src/org/apache/xerces/xinclude XIncludeHandler.java
  Log:
  Fixing a bug. In endElement() we should be decrementing the
  result depth regardless of whether the XIncludeHandler has
  a document handler.
  
  Revision  Changes    Path
  1.51      +5 -5      
xml-xerces/java/src/org/apache/xerces/xinclude/XIncludeHandler.java
  
  Index: XIncludeHandler.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/xinclude/XIncludeHandler.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- XIncludeHandler.java      11 May 2005 16:42:27 -0000      1.50
  +++ XIncludeHandler.java      11 May 2005 17:41:43 -0000      1.51
  @@ -994,11 +994,11 @@
                   setState(STATE_IGNORE);
               }
           }
  -        else if (
  -            fDocumentHandler != null
  -                && getState() == STATE_NORMAL_PROCESSING) {
  +        else if (getState() == STATE_NORMAL_PROCESSING) {
               --fResultDepth;
  -            fDocumentHandler.endElement(element, augs);
  +            if (fDocumentHandler != null) {
  +                fDocumentHandler.endElement(element, augs);
  +            }
           }
   
           // reset the out of scope stack elements
  
  
  

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

Reply via email to