You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/05/22 16:09:34 UTC
cvs commit: cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components DefaultAuthenticationManager.java
cziegeler 2003/05/22 07:09:34
Modified: src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/user
RequestState.java
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components
DefaultAuthenticationManager.java
Log:
Possibly fixing NPE
Revision Changes Path
1.4 +3 -2 cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/user/RequestState.java
Index: RequestState.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/user/RequestState.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RequestState.java 4 May 2003 20:19:39 -0000 1.3
+++ RequestState.java 22 May 2003 14:09:34 -0000 1.4
@@ -83,7 +83,7 @@
return (RequestState)objectModel.get(KEY);
}
- public static void setState(RequestState status) {
+ protected static void setState(RequestState status) {
final Map objectModel = CocoonComponentManager.getCurrentEnvironment().getObjectModel();
if ( status != null ) {
objectModel.put( KEY, status);
@@ -99,6 +99,7 @@
throws ProcessingException {
this.handler = handler;
this.application = app;
+ setState(this);
if ( this.application != null && !this.handler.getApplicationsLoaded()) {
ApplicationConfiguration conf = (ApplicationConfiguration) this.handler.getHandlerConfiguration().getApplications().get(this.application);
if ( !this.handler.isApplicationLoaded( conf ) ) {
1.9 +1 -3 cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java
Index: DefaultAuthenticationManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultAuthenticationManager.java 4 May 2003 20:19:40 -0000 1.8
+++ DefaultAuthenticationManager.java 22 May 2003 14:09:34 -0000 1.9
@@ -226,7 +226,6 @@
// update RequestState
RequestState state = new RequestState( handler, applicationName, this.resolver );
- RequestState.setState( state );
}
@@ -263,7 +262,6 @@
} else {
// update state
RequestState state = new RequestState( handler, applicationName, this.resolver );
- RequestState.setState( state );
}
return authenticated;