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

[mmidy]

mmidy       00/12/14 15:46:13

  Modified:    java/src/org/apache/xalan/templates StylesheetRoot.java
               java/src/org/apache/xalan/transformer TransformerImpl.java
  Log:
  If m_outputProperties is null, fall back to the stylesheetRoot defaults
  
  Revision  Changes    Path
  1.32      +1 -1      
xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java
  
  Index: StylesheetRoot.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- StylesheetRoot.java       2000/12/07 00:59:38     1.31
  +++ StylesheetRoot.java       2000/12/14 23:46:10     1.32
  @@ -188,7 +188,7 @@
      */
     public Properties getOutputProperties()
     {    
  -    return getDefaultOutputProps();
  +    return getDefaultOutputProps().clone();
     }
   
     //============== End Templates Interface ================
  
  
  
  1.60      +4 -1      
xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java
  
  Index: TransformerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- TransformerImpl.java      2000/12/14 23:18:13     1.59
  +++ TransformerImpl.java      2000/12/14 23:46:12     1.60
  @@ -756,7 +756,10 @@
      */
     public Properties getOutputProperties()
     {
  -    return m_outputFormat.getProperties();
  +    if (null == m_outputFormat) 
  +      m_outputFormat = new 
OutputProperties(m_stylesheetRoot.getOutputProperties());
  +    
  +    return (Properties)m_outputFormat.getProperties().clone();  
     }
   
     /**