cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/trax TemplatesHandlerImpl.java TransformerFactoryImpl.java

[tmiller]

tmiller     02/03/07 13:28:13

  Modified:    java/src/org/apache/xalan/xsltc/trax
                        TemplatesHandlerImpl.java
                        TransformerFactoryImpl.java
  Log:
  bug 6312, TemplatesHandler and XMLReader, fix
  by Santiago Pericas
  
  Revision  Changes    Path
  1.4       +4 -5      
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java
  
  Index: TemplatesHandlerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TemplatesHandlerImpl.java 31 Oct 2001 07:29:39 -0000      1.3
  +++ TemplatesHandlerImpl.java 7 Mar 2002 21:28:13 -0000       1.4
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: TemplatesHandlerImpl.java,v 1.3 2001/10/31 07:29:39 morten Exp $
  + * @(#)$Id: TemplatesHandlerImpl.java,v 1.4 2002/03/07 21:28:13 tmiller Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -91,8 +91,9 @@
        // Create and initialize a stylesheet compiler
        final XSLTC xsltc = new XSLTC();
        super.setXSLTC(xsltc);
  -     xsltc.setParser(this);
        xsltc.init();
  +     super.init();
  +     xsltc.setParser(this);
        xsltc.setOutputType(XSLTC.BYTEARRAY_OUTPUT);
       }
   
  @@ -126,10 +127,7 @@
        *         process, or null if no Templates object has been created.
        */
       public Templates getTemplates() {
  -
        try {
  -         // Create a placeholder for the translet bytecodes
  -         byte[][] bytecodes = null;
   
            final XSLTC xsltc = getXSLTC();
   
  @@ -161,6 +159,7 @@
            xsltc.printWarnings();
   
            // Check that the transformation went well before returning
  +         final byte[][] bytecodes = xsltc.getBytecodes();
            if (bytecodes == null) {
                xsltc.printErrors();
                return null;
  
  
  
  1.34      +4 -2      
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java
  
  Index: TransformerFactoryImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- TransformerFactoryImpl.java       12 Nov 2001 18:37:34 -0000      1.33
  +++ TransformerFactoryImpl.java       7 Mar 2002 21:28:13 -0000       1.34
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: TransformerFactoryImpl.java,v 1.33 2001/11/12 18:37:34 morten 
Exp $
  + * @(#)$Id: TransformerFactoryImpl.java,v 1.34 2002/03/07 21:28:13 tmiller 
Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -527,7 +527,9 @@
        */
       public TemplatesHandler newTemplatesHandler() 
        throws TransformerConfigurationException { 
  -     return(new TemplatesHandlerImpl());
  +     final TemplatesHandlerImpl handler = new TemplatesHandlerImpl();
  +     handler.init();
  +     return handler;
       }
   
       /**
  
  
  

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