You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2001/07/03 10:09:49 UTC
cvs commit: xml-cocoon2/src/org/apache/cocoon Main.java
cziegeler 01/07/03 01:09:48
Modified: src/org/apache/cocoon Tag: cocoon_20_branch Main.java
Log:
Fixed NPE by setting the logger for the CommandlineContext
Revision Changes Path
No revision
No revision
1.4.2.3 +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.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- Main.java 2001/06/21 02:35:42 1.4.2.2
+++ Main.java 2001/07/03 08:09:42 1.4.2.3
@@ -48,7 +48,7 @@
* Command line entry point.
*
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4.2.2 $ $Date: 2001/06/21 02:35:42 $
+ * @version CVS $Revision: 1.4.2.3 $ $Date: 2001/07/03 08:09:42 $
*/
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