You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by jf...@apache.org on 2003/08/04 01:28:48 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/logging JetspeedLogFactoryService.java
jford 2003/08/03 16:28:48
Modified: src/java/org/apache/jetspeed/services/logging
JetspeedLogFactoryService.java
Log:
Removed possibility of a NullPointerException
PR: Bugzilla #19906
Revision Changes Path
1.3 +4 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/services/logging/JetspeedLogFactoryService.java
Index: JetspeedLogFactoryService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/logging/JetspeedLogFactoryService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedLogFactoryService.java 26 Jul 2003 04:36:58 -0000 1.2
+++ JetspeedLogFactoryService.java 3 Aug 2003 23:28:48 -0000 1.3
@@ -69,7 +69,6 @@
// Turbine classes
import org.apache.turbine.Turbine;
-import org.apache.turbine.services.BaseInitable;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
@@ -117,7 +116,10 @@
public void init() throws InitializationException
{
ServletConfig conf = Turbine.getTurbineServletConfig();
- init(conf);
+ if(conf != null)
+ {
+ init(conf);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org