ilene       2003/07/11 10:13:38

  Modified:    java/src/org/apache/xalan/xsltc/trax
                        TransformerHandlerImpl.java
               java/src/org/apache/xalan/xsltc/compiler/util
                        ErrorMessages.java ErrorMsg.java
  Log:
  XSLTC: TransformerHandler.setResult should throw an IllegalArgumentException
  when the result argument is null.
  
  Revision  Changes    Path
  1.16      +6 -1      
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java
  
  Index: TransformerHandlerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- TransformerHandlerImpl.java       1 Apr 2003 21:19:06 -0000       1.15
  +++ TransformerHandlerImpl.java       11 Jul 2003 17:13:38 -0000      1.16
  @@ -167,6 +167,11 @@
       public void setResult(Result result) throws IllegalArgumentException {
        _result = result;
   
  +    if (null == result) {
  +       ErrorMsg err = new ErrorMsg(ErrorMsg.ER_RESULT_NULL);
  +       throw new IllegalArgumentException(err.toString()); //"result should 
not be null");
  +    }    
  +       
        if (_isIdentity) {
            try {
                // Connect this object with output system directly
  
  
  
  1.20      +4 -1      
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java
  
  Index: ErrorMessages.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ErrorMessages.java        19 Mar 2003 22:14:09 -0000      1.19
  +++ ErrorMessages.java        11 Jul 2003 17:13:38 -0000      1.20
  @@ -682,6 +682,9 @@
            */
           {ErrorMsg.XSLTC_SOURCE_ERR,
           "XSLTCSource.build() called without systemId being set."},
  +        
  +        { ErrorMsg.ER_RESULT_NULL,
  +            "Result should not be null"},
   
   
           {ErrorMsg.COMPILE_STDIN_ERR,
  
  
  
  1.21      +2 -1      
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java
  
  Index: ErrorMsg.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ErrorMsg.java     19 Mar 2003 22:14:09 -0000      1.20
  +++ ErrorMsg.java     11 Jul 2003 17:13:38 -0000      1.21
  @@ -155,6 +155,7 @@
       public static final String JAXP_UNKNOWN_PROP_ERR = 
"JAXP_UNKNOWN_PROP_ERR";
       public static final String SAX2DOM_ADAPTER_ERR = "SAX2DOM_ADAPTER_ERR";
       public static final String XSLTC_SOURCE_ERR = "XSLTC_SOURCE_ERR";
  +    public static final String ER_RESULT_NULL = "ER_RESULT_NULL";    
   
       // Command-line error messages
       public static final String COMPILE_STDIN_ERR = "COMPILE_STDIN_ERR";
  
  
  

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

Reply via email to