cziegeler 2002/09/04 23:14:23
Modified: src/java/org/apache/cocoon/webapps/authentication/components
AuthenticationManager.java
src/java/org/apache/cocoon/webapps/session/components
SessionManager.java
Log:
Fixing npe
Revision Changes Path
1.14 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/components/AuthenticationManager.java
Index: AuthenticationManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/components/AuthenticationManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AuthenticationManager.java 15 Aug 2002 14:51:27 -0000 1.13
+++ AuthenticationManager.java 5 Sep 2002 06:14:23 -0000 1.14
@@ -14,7 +14,7 @@
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
+ and/or other materials provided with the distribution.F
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
@@ -951,7 +951,7 @@
/**
* Logout from the given handler and eventually terminate session.
* @param logoutHandlerName The authentication handler
- * @param mode This mode defines how the termination of
+ * @param mode This mode defines how the termination of
* the session is handled.
*/
public void logout(String logoutHandlerName,
1.8 +9 -6
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/components/SessionManager.java
Index: SessionManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/components/SessionManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SessionManager.java 15 Aug 2002 14:51:27 -0000 1.7
+++ SessionManager.java 5 Sep 2002 06:14:23 -0000 1.8
@@ -861,23 +861,26 @@
// test arguments
if (contextName == null) {
- throw new IllegalArgumentException("SessionManager.registerInputField:
Context Name is required");
+ throw new ProcessingException("SessionManager.registerInputField:
Context Name is required");
}
if (path == null) {
- throw new IllegalArgumentException("SessionManager.registerInputField:
Path is required");
+ throw new ProcessingException("SessionManager.registerInputField: Path
is required");
}
if (name == null) {
- throw new IllegalArgumentException("SessionManager.registerInputField:
Name is required");
+ throw new ProcessingException("SessionManager.registerInputField: Name
is required");
}
if (formName == null) {
- throw new IllegalArgumentException("SessionManager.registerInputField:
Form is required");
+ throw new ProcessingException("SessionManager.registerInputField: Form
is required");
}
DocumentFragment value = null;
SessionContext context = this.getContext(contextName);
+ if (context == null) {
+ throw new ProcessingException("SessionManager.registerInputField:
Context not found " + contextName);
+ }
Session session = this.getSession(false);
if (session == null) {
- throw new IllegalArgumentException("SessionManager.registerInputField:
Session is required for context " + contextName);
+ throw new ProcessingException("SessionManager.registerInputField:
Session is required for context " + contextName);
}
synchronized(session) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
