[MMBASE SCM] r41963 - mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation

[michiel]

Author: michiel
Date: 2010-04-20 11:35:08 +0200 (Tue, 20 Apr 2010)
New Revision: 41963

Modified:
   
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicList.java
   
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicNode.java
   
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicNodeManager.java
   
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicNodeQuery.java
Log:
MMB-1951

Modified: 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicList.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicList.java
       2010-04-20 09:13:08 UTC (rev 41962)
+++ 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicList.java
       2010-04-20 09:35:08 UTC (rev 41963)
@@ -45,6 +45,15 @@
         backing = new ArrayList<Object>(c);
     }
 
+    /**
+     * @since MMBase-1.9.4
+     */
+    public BasicList(BridgeList<? extends E> b) {
+        super();
+        backing = new ArrayList<Object>(b);
+        properties.putAll(b.getProperties());
+    }
+
     public Object getProperty(Object key) {
         return properties.get(key);
     }

Modified: 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicNode.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicNode.java
       2010-04-20 09:13:08 UTC (rev 41962)
+++ 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicNode.java
       2010-04-20 09:35:08 UTC (rev 41963)
@@ -251,7 +251,7 @@
 
 
     protected void checkAccount()  {
-        if (!account.equals(cloud.getAccount())) {
+        if (account == null || cloud == null || 
!account.equals(cloud.getAccount())) {
             throw new BridgeException("User context changed. Cannot proceed to 
edit this node .");
         }
     }

Modified: 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicNodeManager.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicNodeManager.java
        2010-04-20 09:13:08 UTC (rev 41962)
+++ 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicNodeManager.java
        2010-04-20 09:35:08 UTC (rev 41963)
@@ -297,7 +297,8 @@
         cloud.add(result);
         return result;
     }
-    public final Node createNode() {
+    public final Node createNode(
+) {
         return createBasicNode();
     }
 

Modified: 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicNodeQuery.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicNodeQuery.java
  2010-04-20 09:13:08 UTC (rev 41962)
+++ 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/bridge/implementation/BasicNodeQuery.java
  2010-04-20 09:35:08 UTC (rev 41963)
@@ -210,4 +210,5 @@
     }
 
 
+
 }

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs