dlr 02/01/11 15:16:40
Modified: src/java/org/apache/turbine/pipeline DefaultActionValve.java
Log:
Protected against possible NPEs at object creation time.
Revision Changes Path
1.2 +29 -15
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultActionValve.java
Index: DefaultActionValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultActionValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- DefaultActionValve.java 29 Dec 2001 22:32:48 -0000 1.1
+++ DefaultActionValve.java 11 Jan 2002 23:16:40 -0000 1.2
@@ -56,10 +56,13 @@
import java.io.IOException;
import java.util.Enumeration;
+
+import org.apache.commons.collections.ExtendedProperties;
import org.apache.turbine.Log;
import org.apache.turbine.DynamicURI;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
+import org.apache.turbine.Resolver;
import org.apache.turbine.RunData;
import org.apache.turbine.Resolver;
import org.apache.turbine.TemplateContext;
@@ -79,14 +82,19 @@
* @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: DefaultActionValve.java,v 1.1 2001/12/29 22:32:48 dlr Exp $
+ * @version $Id: DefaultActionValve.java,v 1.2 2002/01/11 23:16:40 dlr Exp $
*/
public class DefaultActionValve
implements Valve, TurbineConstants
{
+ /**
+ * The default session timeout.
+ */
+ protected static final int DEFAULT_TIMEOUT = -1;
+
protected SessionValidator sessionValidator = null;
protected AccessController accessController = null;
- protected int timeout = -1;
+ protected int timeout = DEFAULT_TIMEOUT;
/**
* Here we can setup objects that are thread safe and can be
@@ -96,20 +104,26 @@
public DefaultActionValve()
throws Exception
{
- // Get the instance of the Session Validator.
- sessionValidator = (SessionValidator)
- Turbine.getResolver().getModule(ACTIONS,
- Turbine.getConfiguration().getString(
- ACTION_SESSION_VALIDATOR));
-
- // Get the instance of the AccessController.
- accessController = (AccessController)
- Turbine.getResolver().getModule(ACTIONS,
- Turbine.getConfiguration().getString(
- ACTION_ACCESS_CONTROLLER));
+ Resolver r = Turbine.getResolver();
+ if (r != null)
+ {
+ // Get the instance of the Session Validator.
+ sessionValidator = (SessionValidator)
+ r.getModule(ACTIONS, Turbine.getConfiguration()
+ .getString(ACTION_SESSION_VALIDATOR));
+
+ // Get the instance of the AccessController.
+ accessController = (AccessController)
+ r.getModule(ACTIONS, Turbine.getConfiguration()
+ .getString(ACTION_ACCESS_CONTROLLER));
+ }
- // get the session timeout
- timeout = Turbine.getConfiguration().getInt(SESSION_TIMEOUT, -1);
+ ExtendedProperties cfg = Turbine.getConfiguration();
+ if (cfg != null)
+ {
+ // Get the session timeout.
+ timeout = cfg.getInt(SESSION_TIMEOUT, DEFAULT_TIMEOUT);
+ }
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
