Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv12600

Modified Files:
        AbstractCollectionNodeList.java 
Log Message:
added a last fall back to convert also MMObjectNodes. This fixes a failing test 
(FunctionsTest#testNodeFunctionWithNodeListResult1(), 'contains null'


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util


Index: AbstractCollectionNodeList.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/util/AbstractCollectionNodeList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- AbstractCollectionNodeList.java     3 Feb 2008 17:33:56 -0000       1.4
+++ AbstractCollectionNodeList.java     13 Jun 2008 09:22:06 -0000      1.5
@@ -96,6 +96,9 @@
                 // last desperate try, depend on a nodelist of cloud (that 
know how to convert core objects..)
                 // hackery
                 node = AbstractNodeList.convertWithBridgeToNode(cloud, 
nodeManager, o);
+                if (node == null) {
+                    node = 
AbstractNodeList.convertMMObjectNodetoBridgeNode(cloud, nodeManager, o);
+                }
             } else {
                 // even more desperate!
                 node = getCloud().getNode(Casting.toString(o));
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to