Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv12860
Modified Files:
AbstractNodeList.java
Log Message:
don't use null for cloud, gives NPE in VirtualNode
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation
Index: AbstractNodeList.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/AbstractNodeList.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- AbstractNodeList.java 13 Jun 2008 09:20:16 -0000 1.11
+++ AbstractNodeList.java 13 Jun 2008 09:28:03 -0000 1.12
@@ -22,7 +22,7 @@
/**
* @since MMBase-1.9
- * @version $Id: AbstractNodeList.java,v 1.11 2008/06/13 09:20:16 michiel Exp $
+ * @version $Id: AbstractNodeList.java,v 1.12 2008/06/13 09:28:03 michiel Exp $
*/
public abstract class AbstractNodeList<E extends Node> extends BasicList<E> {
@@ -175,7 +175,13 @@
if (nodeManager != null) {
node = new VirtualNode(cloud,
(org.mmbase.module.core.VirtualNode) coreNode, nodeManager);
} else {
+ if (cloud != null) {
node = new
VirtualNode((org.mmbase.module.core.VirtualNode) coreNode, cloud);
+ } else {
+ // last resort: use an anonymous cloud
+ // ? use class security?
+ node = new
VirtualNode((org.mmbase.module.core.VirtualNode) coreNode,
ContextProvider.getDefaultCloudContext().getCloud("mmbase"));
+ }
}
} else {
node = new VirtualNode(cloud,
(org.mmbase.module.core.VirtualNode) coreNode,
cloud.getNodeManager(builder.getObjectType()));
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
