jvanzyl 01/07/25 16:36:32
Modified: src/java/org/apache/turbine Turbine.java
Log:
- null check for system properties to set
Revision Changes Path
1.80 +13 -9 jakarta-turbine/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- Turbine.java 2001/07/25 05:39:03 1.79
+++ Turbine.java 2001/07/25 23:36:31 1.80
@@ -108,7 +108,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Turbine.java,v 1.79 2001/07/25 05:39:03 dlr Exp $
+ * @version $Id: Turbine.java,v 1.80 2001/07/25 23:36:31 jvanzyl Exp $
*/
public class Turbine
extends HttpServlet
@@ -608,15 +608,19 @@
// Set some system properties
Configuration systemProperties = configuration.subset("system");
- Iterator k = systemProperties.getKeys();
-
- while (k.hasNext())
+
+ if (systemProperties != null)
{
- String name = (String) k.next();
- String value = systemProperties.getString(name);
- Log.debug("[Turbine] System Property: " + name + " => " + value);
- System.getProperties().setProperty(name, value);
- }
+ Iterator k = systemProperties.getKeys();
+
+ while (k.hasNext())
+ {
+ String name = (String) k.next();
+ String value = systemProperties.getString(name);
+ Log.debug("[Turbine] System Property: " + name + " => " + value);
+ System.getProperties().setProperty(name, value);
+ }
+ }
// Setup the default pipeline. There will be a pipeline
// per (sub)app, just like there will be a module loader
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
