[MMBASE CVS] src/org/mmbase/framework/basic BasicFramework.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv4419

Modified Files:
        BasicFramework.java 
Log Message:
for the 'getNode' method the Cloud parameter must be available. Also made it 
possible to get setting value without request object (though of course not 
coming from the session then)


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework/basic


Index: BasicFramework.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BasicFramework.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- BasicFramework.java 7 Aug 2008 14:04:55 -0000       1.23
+++ BasicFramework.java 8 Aug 2008 12:44:17 -0000       1.24
@@ -34,7 +34,7 @@
  * are configured is the order in which they are processed.
  *
  * @author Michiel Meeuwissen
- * @version $Id: BasicFramework.java,v 1.23 2008/08/07 14:04:55 michiel Exp $
+ * @version $Id: BasicFramework.java,v 1.24 2008/08/08 12:44:17 michiel Exp $
  * @since MMBase-1.9
  */
 public class BasicFramework extends Framework {
@@ -214,7 +214,7 @@
     /**
      */
     public Parameter[] getParameterDefinition() {
-        return new Parameter[] { ACTION, Parameter.REQUEST, new 
Parameter.Wrapper(urlConverter.getParameterDefinition())};
+        return new Parameter[] { ACTION, Parameter.REQUEST, Parameter.CLOUD, 
new Parameter.Wrapper(urlConverter.getParameterDefinition())};
     }
 
     public Parameters createParameters() {
@@ -303,7 +303,7 @@
 
     public Node getUserNode(Parameters frameworkParameters) {
         Cloud cloud = frameworkParameters.get(Parameter.CLOUD);
-        return 
cloud.getCloudContext().getAuthentication().getNode(cloud.getUser());
+        return cloud == null ? null : 
cloud.getCloudContext().getAuthentication().getNode(cloud.getUser());
     }
 
     public String getUserBuilder() {
@@ -358,11 +358,13 @@
         boolean useSession = parameters != null && parameters.get(USE_REQ);
         if (useSession) {
             HttpServletRequest req = parameters.get(Parameter.REQUEST);
+            if (req != null) {
             Object v = req.getSession(true).getAttribute(getKey(setting));
             if (v != null) {
                 return setting.getDataType().cast(v, null, null);
             }
         }
+        }
         if (settingValues.containsKey(setting)) {
             return (C) settingValues.get(setting);
         } else {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs