[MMBASE SCM] r39777 - in mmbase: tags/MMBase-1_9_2.2009-11-04/applications/rmmci/src/main/java/org/mmbase/bridge/remote/util trunk/applications/rmmci/src/main/java/org/mmbase/bridge/remote/util

[nico]

Author: nico
Date: 2009-11-18 15:52:34 +0100 (Wed, 18 Nov 2009)
New Revision: 39777

Modified:
   
mmbase/tags/MMBase-1_9_2.2009-11-04/applications/rmmci/src/main/java/org/mmbase/bridge/remote/util/ObjectWrapper.java
   
mmbase/trunk/applications/rmmci/src/main/java/org/mmbase/bridge/remote/util/ObjectWrapper.java
Log:
Also wrap map values to remote objects

Modified: 
mmbase/tags/MMBase-1_9_2.2009-11-04/applications/rmmci/src/main/java/org/mmbase/bridge/remote/util/ObjectWrapper.java
===================================================================
--- 
mmbase/tags/MMBase-1_9_2.2009-11-04/applications/rmmci/src/main/java/org/mmbase/bridge/remote/util/ObjectWrapper.java
       2009-11-18 14:49:22 UTC (rev 39776)
+++ 
mmbase/tags/MMBase-1_9_2.2009-11-04/applications/rmmci/src/main/java/org/mmbase/bridge/remote/util/ObjectWrapper.java
       2009-11-18 14:52:34 UTC (rev 39777)
@@ -39,7 +39,14 @@
                     list.add(localToRMIObject(object));
                 }
                 retval = list;
-            }
+            } else if (o instanceof Map) {
+               Map<?,?> source = (Map<?,?>)o;
+               Map<Object, Object> map = new HashMap<Object, Object>();
+               for (Map.Entry<?, ?> entry : source.entrySet()) {
+                  map.put(entry.getKey(), localToRMIObject(entry.getValue()));
+               }
+               retval = map;
+           }
         }
         return retval;
     }

Modified: 
mmbase/trunk/applications/rmmci/src/main/java/org/mmbase/bridge/remote/util/ObjectWrapper.java
===================================================================
--- 
mmbase/trunk/applications/rmmci/src/main/java/org/mmbase/bridge/remote/util/ObjectWrapper.java
      2009-11-18 14:49:22 UTC (rev 39776)
+++ 
mmbase/trunk/applications/rmmci/src/main/java/org/mmbase/bridge/remote/util/ObjectWrapper.java
      2009-11-18 14:52:34 UTC (rev 39777)
@@ -39,6 +39,13 @@
                     list.add(localToRMIObject(object));
                 }
                 retval = list;
+            } else if (o instanceof Map) {
+               Map<?,?> source = (Map<?,?>)o;
+               Map<Object, Object> map = new HashMap<Object, Object>();
+               for (Map.Entry<?, ?> entry : source.entrySet()) {
+                  map.put(entry.getKey(), localToRMIObject(entry.getValue()));
+               }
+               retval = map;
             }
         }
         return retval;

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