[Amdatu-commits] SVN r222 - trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant

[subvers...@amdatu.org]

Author: angelo.vandersijpt at luminis.eu
Date: Fri Oct 29 17:21:56 2010
New Revision: 222

Log:
AMDATU-144 Oversight when working on AMDATU-121; tenant properties are now, 
once again, allowed to be null.

Modified:
   
trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/TenantEntity.java

Modified: 
trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/TenantEntity.java
==============================================================================
--- 
trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/TenantEntity.java
    (original)
+++ 
trunk/platform-bundles/tenant-service/src/main/java/org/amdatu/platform/tenant/TenantEntity.java
    Fri Oct 29 17:21:56 2010
@@ -25,7 +25,7 @@
  */
 public class TenantEntity implements Tenant {
     private final String m_id;
-    private final Map<String, String> m_properties;
+    private final Map<String, String> m_properties = new HashMap<String, 
String>();
 
     private String m_name;
 
@@ -35,7 +35,9 @@
         }
         m_id = id;
         m_name = name;
-        m_properties = new HashMap<String, String>(properties);
+        if (properties != null) {
+            m_properties.putAll(properties);
+        }
     }
 
     public TenantEntity(String id, String name) {