dlr 02/01/11 15:19:16
Modified: src/java/org/apache/turbine/pipeline DefaultTargetValve.java
Log:
Protected against possible NPEs at object creation time.
Revision Changes Path
1.2 +14 -6
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java
Index: DefaultTargetValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- DefaultTargetValve.java 29 Dec 2001 22:32:48 -0000 1.1
+++ DefaultTargetValve.java 11 Jan 2002 23:19:16 -0000 1.2
@@ -56,6 +56,8 @@
import java.io.IOException;
import java.util.Enumeration;
+
+import org.apache.commons.collections.ExtendedProperties;
import org.apache.fulcrum.security.util.AccessControlList;
import org.apache.turbine.Log;
import org.apache.turbine.DynamicURI;
@@ -79,13 +81,15 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: DefaultTargetValve.java,v 1.1 2001/12/29 22:32:48 dlr Exp $
+ * @version $Id: DefaultTargetValve.java,v 1.2 2002/01/11 23:19:16 dlr Exp $
*/
public class DefaultTargetValve
implements Valve
{
+ protected static final String DEFAULT_TARGET_MODULE_TYPE = "screens";
+
protected ModuleRunner runner = null;
- protected String targetModuleType;
+ protected String targetModuleType = DEFAULT_TARGET_MODULE_TYPE;
/**
* Creates a new instance with the <code>targetModuleType</code>
@@ -97,10 +101,14 @@
// Instantiate the ModuleRunner
runner = new ModuleRunner();
- // Get the module type
- targetModuleType =
- Turbine.getConfiguration().getString(
- "pipeline.default.targetModuleType");
+ ExtendedProperties cfg = Turbine.getConfiguration();
+ if (cfg != null)
+ {
+ // Get the module type
+ targetModuleType =
+ cfg.getString("pipeline.default.targetModuleType",
+ DEFAULT_TARGET_MODULE_TYPE);
+ }
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
