Author: michiel
Date: 2009-05-19 11:39:03 +0200 (Tue, 19 May 2009)
New Revision: 35303
Modified:
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/Verify.java
Log:
Still no good
Modified:
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
2009-05-19 08:18:59 UTC (rev 35302)
+++
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
2009-05-19 09:39:03 UTC (rev 35303)
@@ -202,6 +202,7 @@
* @return The MMObjectNode presenting the context of the given node.
*/
public MMObjectNode getContextNode(MMObjectNode node) {
+ if (node == null) return null;
String s = node.getStringValue("owner");
return getContextNode(s);
Modified:
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/Verify.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/Verify.java
2009-05-19 08:18:59 UTC (rev 35302)
+++
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/Verify.java
2009-05-19 09:39:03 UTC (rev 35303)
@@ -110,7 +110,9 @@
-
+ /**
+ * For a certain node, returns the node representing its 'context'.
+ */
protected MMObjectNode getContextNode(int nodeId, boolean exception) {
MMObjectNode node =
getContextProvider().getContextQueries().iterator().next().getBuilder().getNode(nodeId);
if (node == null) {
@@ -120,7 +122,7 @@
log.warn("node #" + nodeId + " not found");
}
}
- return node;
+ return getContextProvider().getContextNode(node);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
