morten      01/10/08 07:22:21

  Modified:    java/src/org/apache/xalan/xsltc/trax TransformerImpl.java
  Log:
  Another fix to prevent NPE in setOutputProperty()
  Submitted by: [EMAIL PROTECTED]
  Reviewed by:  [EMAIL PROTECTED]
  
  Revision  Changes    Path
  1.24      +7 -6      
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java
  
  Index: TransformerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- TransformerImpl.java      2001/10/08 14:18:54     1.23
  +++ TransformerImpl.java      2001/10/08 14:22:21     1.24
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: TransformerImpl.java,v 1.23 2001/10/08 14:18:54 morten Exp $
  + * @(#)$Id: TransformerImpl.java,v 1.24 2001/10/08 14:22:21 morten Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -645,13 +645,14 @@
                }
            }
            else if (name.equals(OutputKeys.CDATA_SECTION_ELEMENTS)) {
  -             translet._cdata = null; // Important - clear previous setting
  -             StringTokenizer e = new StringTokenizer(value);
  -             while (e.hasMoreTokens()) {
  -                 translet.addCdataElement(e.nextToken());
  +             if ((value != null) && (value.toLowerCase().equals("true"))) {
  +                 translet._cdata = null; // clear previous setting
  +                 StringTokenizer e = new StringTokenizer(value);
  +                 while (e.hasMoreTokens()) {
  +                     translet.addCdataElement(e.nextToken());
  +                 }
                }
            }
  -
        }
       }
   
  
  
  

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

Reply via email to