Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv22962
Modified Files:
BasicFramework.java
Log Message:
this makes sure that the return node is of the same cloud
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.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- BasicFramework.java 25 Oct 2008 08:32:01 -0000 1.38
+++ BasicFramework.java 13 Nov 2008 16:24:37 -0000 1.39
@@ -33,7 +33,7 @@
* are configured is the order in which they are processed.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicFramework.java,v 1.38 2008/10/25 08:32:01 michiel Exp $
+ * @version $Id: BasicFramework.java,v 1.39 2008/11/13 16:24:37 michiel Exp $
* @since MMBase-1.9
*/
public class BasicFramework extends Framework {
@@ -272,7 +272,16 @@
public Node getUserNode(Parameters frameworkParameters) {
Cloud cloud = frameworkParameters.get(Parameter.CLOUD);
- return cloud == null ? null :
cloud.getCloudContext().getAuthentication().getNode(cloud.getUser());
+ if (cloud == null) {
+ return null;
+ } else {
+ int userNode =
cloud.getCloudContext().getAuthentication().getNode(cloud.getUser());
+ if (cloud.hasNode(userNode)) {
+ return cloud.getNode(userNode);
+ } else {
+ return null;
+ }
+ }
}
public String getUserBuilder() {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
