dims 01/08/15 05:32:49
Modified: src/org/apache/cocoon/acting Tag: cocoon_20_branch
SessionValidatorAction.java
Log:
Patch from Dauben, Oliver [mailto:[EMAIL PROTECTED]]
for NPE in SessionValidatorAction
Revision Changes Path
No revision
No revision
1.3.2.5 +7 -7
xml-cocoon2/src/org/apache/cocoon/acting/SessionValidatorAction.java
Index: SessionValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionValidatorAction.java,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- SessionValidatorAction.java 2001/08/14 14:48:59 1.3.2.4
+++ SessionValidatorAction.java 2001/08/15 12:32:49 1.3.2.5
@@ -1,4 +1,4 @@
-// $Id: SessionValidatorAction.java,v 1.3.2.4 2001/08/14 14:48:59 dims Exp $
+// $Id: SessionValidatorAction.java,v 1.3.2.5 2001/08/15 12:32:49 dims Exp $
package org.apache.cocoon.acting;
import java.util.Collections;
@@ -53,7 +53,7 @@
* all validated parameters to the sitemap via {name} expression.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/08/14 14:48:59 $
+ * @version CVS $Revision: 1.3.2.5 $ $Date: 2001/08/15 12:32:49 $
*/
public class SessionValidatorAction extends AbstractValidatorAction
{
@@ -81,15 +81,15 @@
boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT;
if (this.settings.containsKey("reloadable"))
reloadable = Boolean.getBoolean((String) this.settings.get("reloadable"));
- String valsetstr = (String) this.settings.get("validate-set");
- String valstr = (String) this.settings.get("validate");
try {
Configuration conf = this.getConfiguration (
parameters.getParameter ("descriptor", (String)
this.settings.get("descriptor")),
parameters.getParameterAsBoolean("reloadable",reloadable));
- valstr = parameters.getParameter ("validate", valstr);
- valsetstr = parameters.getParameter ("validate-set", valsetstr);
+
+ String valsetstr = parameters.getParameter ( "validate-set", (String)
settings.get("validate-set") );
+ String valstr = parameters.getParameter ( "validate", (String)
settings.get("validate") );
+
Configuration[] desc = conf.getChildren ("parameter");
Configuration[] csets = conf.getChildren ("constraint-set");
HashMap actionMap = new HashMap ();
@@ -198,5 +198,5 @@
}
}
-// $Id: SessionValidatorAction.java,v 1.3.2.4 2001/08/14 14:48:59 dims Exp $
+// $Id: SessionValidatorAction.java,v 1.3.2.5 2001/08/15 12:32:49 dims Exp $
// vim: set et ts=4 sw=4:
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
