kinman      2003/01/30 12:13:56

  Modified:    jasper2/src/share/org/apache/jasper/compiler Compiler.java
  Log:
  - Fixed a NPE caused by nulling errorDispatcher: it is needed for Parser.
  
  Revision  Changes    Path
  1.49      +4 -3      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- Compiler.java     30 Jan 2003 03:22:01 -0000      1.48
  +++ Compiler.java     30 Jan 2003 20:13:56 -0000      1.49
  @@ -143,9 +143,6 @@
       // Lazy eval - if we don't need to compile we probably don't need the project
       private Project getProject() {
   
  -        if (errDispatcher == null) {
  -            this.errDispatcher = new ErrorDispatcher();
  -        }
           if( project!=null ) return project;
   
           // Initializing project
  @@ -421,6 +418,10 @@
       public void compile()
           throws FileNotFoundException, JasperException, Exception
       {
  +        if (errDispatcher == null) {
  +            this.errDispatcher = new ErrorDispatcher();
  +        }
  +
           try {
               generateJava();
               generateClass();
  
  
  

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

Reply via email to