0020129: OBContext class getters returning a reference to the class instance attributes (not a new instance of the attribute)

diff --git a/src-test/org/openbravo/test/dal/IssuesTest.java b/src-test/org/openbravo/test/dal/IssuesTest.java
--- a/src-test/org/openbravo/test/dal/IssuesTest.java
+++ b/src-test/org/openbravo/test/dal/IssuesTest.java
@@ -28,6 +28,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.log4j.Logger;
 import org.dom4j.Document;
@@ -47,6 +48,7 @@
 import org.openbravo.dal.core.DalThreadHandler;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.core.OBInterceptor;
+import org.openbravo.dal.security.OrganizationStructureProvider;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
@@ -642,9 +644,29 @@
     query.setString(0, "en_US");
     query.setString(1, "800025");
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "unused" })
     java.util.List<Object[]> l = query.list();
 
   }
 
+  /**
+   * Testing issue 0020129.OBContext class getters returning a reference to the class instance
+   * attributes (not a new instance of the attribute)
+   */
+  public void test20129() {
+    setTestAdminContext();
+
+    final String clientId = OBContext.getOBContext().getCurrentClient().getId();
+    final OrganizationStructureProvider osp = OBContext.getOBContext()
+        .getOrganizationStructureProvider(clientId);
+    final Set<String> childOrg = osp.getChildOrg(OBContext.getOBContext().getCurrentOrganization()
+        .getId());
+
+    childOrg.removeAll(childOrg);
+
+    final Set<String> childOrg2 = osp.getChildOrg(OBContext.getOBContext().getCurrentOrganization()
+        .getId());
+
+    assertFalse(childOrg2.isEmpty());
+  }
 }
\ No newline at end of file

diff --git a/src-test/org/openbravo/test/dal/IssuesTest.java b/src-test/org/openbravo/test/dal/IssuesTest.java
--- a/src-test/org/openbravo/test/dal/IssuesTest.java
+++ b/src-test/org/openbravo/test/dal/IssuesTest.java
@@ -28,6 +28,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.log4j.Logger;
 import org.dom4j.Document;
@@ -47,6 +48,8 @@
 import org.openbravo.dal.core.DalThreadHandler;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.core.OBInterceptor;
+import org.openbravo.dal.security.EntityAccessChecker;
+import org.openbravo.dal.security.OrganizationStructureProvider;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
@@ -54,6 +57,7 @@
 import org.openbravo.data.UtilSql;
 import org.openbravo.model.ad.access.Role;
 import org.openbravo.model.ad.access.User;
+import org.openbravo.model.ad.alert.AlertRule;
 import org.openbravo.model.ad.datamodel.Table;
 import org.openbravo.model.ad.module.Module;
 import org.openbravo.model.ad.process.ProcessInstance;
@@ -66,6 +70,7 @@
 import org.openbravo.model.common.businesspartner.Category;
 import org.openbravo.model.common.businesspartner.Location;
 import org.openbravo.model.common.enterprise.Organization;
+import org.openbravo.model.common.enterprise.Warehouse;
 import org.openbravo.model.common.invoice.InvoiceLine;
 import org.openbravo.model.common.order.Order;
 import org.openbravo.model.common.plm.Product;
@@ -651,4 +656,169 @@
 
   }
 
+  /**
+   * Testing issue 20129. https://issues.openbravo.com/view.php?id=20129 Tests getChildOrg()
+   */
+  public void test20129A() {
+    setTestAdminContext();
+    final String clientId = OBContext.getOBContext().getCurrentClient().getId();
+    final OrganizationStructureProvider osp = OBContext.getOBContext()
+        .getOrganizationStructureProvider(clientId);
+    final Set<String> childOrg = osp.getChildOrg(OBContext.getOBContext().getCurrentOrganization()
+        .getId());
+    childOrg.removeAll(childOrg);
+    final Set<String> childOrg2 = osp.getChildOrg(OBContext.getOBContext().getCurrentOrganization()
+        .getId());
+    assertFalse(childOrg2.isEmpty());
+  }
+
+  /**
+   * Tests getNaturalTree()
+   */
+  public void test20129B() {
+    setTestAdminContext();
+    final String clientId = OBContext.getOBContext().getCurrentClient().getId();
+    final OrganizationStructureProvider osp = OBContext.getOBContext()
+        .getOrganizationStructureProvider(clientId);
+    final Set<String> naturalTree = osp.getNaturalTree(OBContext.getOBContext()
+        .getCurrentOrganization().getId());
+    naturalTree.removeAll(naturalTree);
+    final Set<String> naturalTree2 = osp.getNaturalTree(OBContext.getOBContext()
+        .getCurrentOrganization().getId());
+    assertFalse(naturalTree2.isEmpty());
+  }
+
+  /**
+   * Tests getReadableOrganizations()
+   */
+  public void test20129C() {
+    setTestAdminContext();
+    String[] readableOrganizations = OBContext.getOBContext().getReadableOrganizations();
+    readableOrganizations[0] = "Test";
+    String[] readableOrganizations2 = OBContext.getOBContext().getReadableOrganizations();
+    assertFalse("Test".equals(readableOrganizations2[0]));
+  }
+
+  /**
+   * Tests getReadableClients()
+   */
+  public void test20129D() {
+    setTestAdminContext();
+    String[] readableClients = OBContext.getOBContext().getReadableClients();
+    readableClients[0] = "Test";
+    String[] readableClients2 = OBContext.getOBContext().getReadableClients();
+    assertFalse("Test".equals(readableClients2[0]));
+  }
+
+  /**
+   * Tests getCurrentClient()
+   */
+  public void test20129E() {
+    setTestAdminContext();
+    Client currentClient = OBContext.getOBContext().getCurrentClient();
+    currentClient.setDescription("Test description");
+    Client currentClient2 = OBContext.getOBContext().getCurrentClient();
+    assertFalse("Test description".equals(currentClient2.getDescription()));
+  }
+
+  /**
+   * Tests currentOrganization()
+   */
+  public void test20129F() {
+    setTestAdminContext();
+    Organization currentOrganization = OBContext.getOBContext().getCurrentOrganization();
+    currentOrganization.setDescription("Test description");
+    Organization currentOrganization2 = OBContext.getOBContext().getCurrentOrganization();
+    assertFalse("Test description".equals(currentOrganization2.getDescription()));
+  }
+
+  /**
+   * Tests getRole()
+   */
+  public void test20129G() {
+    setTestAdminContext();
+    Role role = OBContext.getOBContext().getRole();
+    role.setDescription("Test description");
+    Role role2 = OBContext.getOBContext().getRole();
+    assertFalse("Test description".equals(role2.getDescription()));
+  }
+
+  /**
+   * Tests getUser()
+   */
+  public void test20129H() {
+    setTestAdminContext();
+    User user = OBContext.getOBContext().getUser();
+    user.setDescription("Test description");
+    User user2 = OBContext.getOBContext().getUser();
+    assertFalse("Test description".equals(user2.getDescription()));
+  }
+
+  /**
+   * Tests getUser()
+   */
+  public void test20129I() {
+    setTestAdminContext();
+    Language language = OBContext.getOBContext().getLanguage();
+    language.setName("Test");
+    Language language2 = OBContext.getOBContext().getLanguage();
+    assertFalse("Test".equals(language2.getName()));
+  }
+
+  /**
+   * Tests getWarehouse()
+   */
+  public void test20129J() {
+    setTestUserContext();
+    Warehouse warehouse = OBContext.getOBContext().getWarehouse();
+    warehouse.setDescription("Test description");
+    Warehouse warehouse2 = OBContext.getOBContext().getWarehouse();
+    assertFalse("Test description".equals(warehouse2.getDescription()));
+  }
+
+  /**
+   * Tests getWritableOrganizations()
+   */
+  public void test20129K() {
+    setTestAdminContext();
+    Set<String> writableOrganizations = OBContext.getOBContext().getWritableOrganizations();
+    writableOrganizations.removeAll(writableOrganizations);
+    Set<String> writableOrganizations2 = OBContext.getOBContext().getWritableOrganizations();
+    assertFalse(writableOrganizations2.isEmpty());
+  }
+
+  /**
+   * Tests getOrganizationStructureProvider()
+   */
+  public void test20129L() {
+    setTestAdminContext();
+    final String clientId = OBContext.getOBContext().getCurrentClient().getId();
+    OrganizationStructureProvider osp = OBContext.getOBContext().getOrganizationStructureProvider(
+        clientId);
+    osp.setClientId("Test");
+    OrganizationStructureProvider osp2 = OBContext.getOBContext().getOrganizationStructureProvider(
+        clientId);
+    assertFalse("Test".equals(osp2.getClientId()));
+  }
+
+  /**
+   * Tests getEntityAccessChecker()
+   */
+  public void test20129M() {
+    setTestAdminContext();
+    EntityAccessChecker eac = OBContext.getOBContext().getEntityAccessChecker();
+    eac.setRoleId("Test");
+    EntityAccessChecker eac2 = OBContext.getOBContext().getEntityAccessChecker();
+    assertFalse("Test".equals(eac2.getRoleId()));
+  }
+
+  public void testNewAlertRule() {
+    final AlertRule alertRule = OBProvider.getInstance().get(AlertRule.class);
+    Client currentClient = OBContext.getOBContext().getCurrentClient();
+    alertRule.setClient(currentClient);
+    alertRule.setName("Test Alert Rule");
+    alertRule.setActive(true);
+    OBDal.getInstance().save(alertRule);
+  }
+
 }
\ No newline at end of file
diff --git a/src/org/openbravo/dal/core/OBContext.java b/src/org/openbravo/dal/core/OBContext.java
--- a/src/org/openbravo/dal/core/OBContext.java
+++ b/src/org/openbravo/dal/core/OBContext.java
@@ -545,7 +545,7 @@
   @SuppressWarnings("unchecked")
   private List<Organization> getOrganizationList(Role thisRole) {
     if (organizationList != null) {
-      return organizationList;
+      return new ArrayList<Organization>(organizationList);
     }
     final Query qry = SessionHandler.getInstance().createQuery(
         "select o from " + Organization.class.getName() + " o, " + RoleOrganization.class.getName()
@@ -561,7 +561,7 @@
         organizationList.add(org);
       }
     }
-    return organizationList;
+    return new ArrayList<Organization>(organizationList);
   }
 
   @SuppressWarnings("unchecked")
@@ -595,7 +595,8 @@
   }
 
   public Client getCurrentClient() {
-    return currentClient;
+
+    return (Client) DalUtil.copy(currentClient, true, false);
   }
 
   public void setCurrentClient(Client currentClient) {
@@ -607,7 +608,7 @@
   }
 
   public Language getLanguage() {
-    return language;
+    return (Language) DalUtil.copy(language, true, false);
   }
 
   public void setLanguage(Language language) {
@@ -616,7 +617,7 @@
   }
 
   public Organization getCurrentOrganization() {
-    return currentOrganization;
+    return (Organization) DalUtil.copy(currentOrganization, true, false);
   }
 
   public void removeWritableOrganization(String orgId) {
@@ -931,7 +932,7 @@
   }
 
   public User getUser() {
-    return user;
+    return (User) DalUtil.copy(user, true, false);
   }
 
   public void setUser(User user) {
@@ -939,7 +940,7 @@
   }
 
   public Role getRole() {
-    return role;
+    return (Role) DalUtil.copy(role, true, false);
   }
 
   public void setRole(Role role) {
@@ -972,21 +973,21 @@
     if (readableOrganizations == null) {
       setReadableOrganizations(getRole());
     }
-    return readableOrganizations;
+    return readableOrganizations.clone();
   }
 
   public Set<String> getWritableOrganizations() {
     if (writableOrganizations == null) {
       setWritableOrganizations(getRole());
     }
-    return writableOrganizations;
+    return new HashSet<String>(writableOrganizations);
   }
 
   public String[] getReadableClients() {
     if (readableClients == null) {
       setReadableClients(getRole());
     }
-    return readableClients;
+    return readableClients.clone();
   }
 
   public EntityAccessChecker getEntityAccessChecker() {
diff --git a/src/org/openbravo/dal/security/OrganizationStructureProvider.java b/src/org/openbravo/dal/security/OrganizationStructureProvider.java
--- a/src/org/openbravo/dal/security/OrganizationStructureProvider.java
+++ b/src/org/openbravo/dal/security/OrganizationStructureProvider.java
@@ -127,10 +127,12 @@
    */
   public Set<String> getNaturalTree(String orgId) {
     initialize();
-    Set<String> result = naturalTreesByOrgID.get(orgId);
-    if (result == null) {
+    Set<String> result;
+    if (naturalTreesByOrgID.get(orgId) == null) {
       result = new HashSet<String>();
       result.add(orgId);
+    } else {
+      result = new HashSet<String>(naturalTreesByOrgID.get(orgId));
     }
     return result;
   }
@@ -266,7 +268,7 @@
     if (childByOrganizationID.get(orgId) == null) {
       reInitialize();
     }
-    return childByOrganizationID.get(orgId);
+    return new HashSet<String>(childByOrganizationID.get(orgId));
   }
 
   class OrgNode {