cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon Main.java
Date Tue, 03 Jul 2001 08:11:38 GMT
cziegeler    01/07/03 01:11:38

  Modified:    src/org/apache/cocoon Main.java
  Log:
  Fixed NPE by setting the logger for the CommandlineContext
  
  Revision  Changes    Path
  1.7       +4 -2      xml-cocoon2/src/org/apache/cocoon/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Main.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Main.java	2001/06/21 02:31:42	1.6
  +++ Main.java	2001/07/03 08:11:34	1.7
  @@ -48,7 +48,7 @@
    * Command line entry point.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2001/06/21 02:31:42 $
  + * @version CVS $Revision: 1.7 $ $Date: 2001/07/03 08:11:34 $
    */
   
   public class Main {
  @@ -233,7 +233,9 @@
               File conf = getConfigurationFile(context);
               DefaultContext appContext = new DefaultContext();
               appContext.put(Constants.CONTEXT_CLASS_LOADER, Main.class.getClassLoader());
  -            appContext.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, new CommandlineContext(contextDir));
  +            CommandlineContext clContext = new CommandlineContext(contextDir);
  +            clContext.setLogger(log);
  +            appContext.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, clContext);
               appContext.put(Constants.CONTEXT_CLASSPATH, getClassPath(contextDir));
               appContext.put(Constants.CONTEXT_WORK_DIR, work);
               appContext.put(Constants.CONTEXT_UPLOAD_DIR, contextDir + "image-dir");
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message