cvs commit: xml-xalan/java/src/org/apache/xalan/transformer TrAXFilter.java

[sboag]

sboag       00/11/06 09:51:50

  Modified:    java/src/org/apache/xalan/transformer TrAXFilter.java
  Log:
  Mainly fixes for exception handling.
  
  Revision  Changes    Path
  1.2       +18 -2     
xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java
  
  Index: TrAXFilter.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TrAXFilter.java   2000/11/03 23:28:12     1.1
  +++ TrAXFilter.java   2000/11/06 17:51:46     1.2
  @@ -91,12 +91,28 @@
                             true);
         }
         catch (SAXException se){}
  -      setParent (parent);
  +      // setParent calls setupParse...
  +      setParent(parent);
       }
       else
  +    {
  +      // Make sure everything is set up.
         setupParse ();
  +    }
  +    if(null == m_transformer.getContentHandler())
  +    {
  +      throw new SAXException("parse can not be called if the ContentHandler 
has not been set!");
  +    }
   
       getParent().parse(input);
  +    Exception e = m_transformer.getExceptionThrown();
  +    if(null != e)
  +    {
  +      if(e instanceof SAXException)
  +        throw (SAXException)e;
  +      else
  +        throw new SAXException(e);
  +    }
     }
     
     /**
  @@ -163,7 +179,7 @@
     public void setContentHandler (ContentHandler handler)
     {
       m_transformer.setContentHandler(handler);
  -    super.setContentHandler(m_transformer.getResultTreeHandler());
  +    // super.setContentHandler(m_transformer.getResultTreeHandler());
     }
     
     public void setErrorHandler (ErrorHandler handler)