[Carbon-commits] [Carbon] svn commit r113374 - trunk/carbon/components/bam/org.wso2.carbon.bam.utils/src/main/java/org/wso2/carbon/bam/utils/persistence

[buddhikac at wso2.com]

Author: buddhikac
Date: Sun Oct  2 22:57:24 2011
New Revision: 113374
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=113374

Log:
Changing tenant retrieval for QueryManager.


Modified:
   trunk/carbon/components/bam/org.wso2.carbon.bam.utils/src/main/java/org/wso2/carbon/bam/utils/persistence/QueryManagerFactory.java

Modified: trunk/carbon/components/bam/org.wso2.carbon.bam.utils/src/main/java/org/wso2/carbon/bam/utils/persistence/QueryManagerFactory.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/bam/org.wso2.carbon.bam.utils/src/main/java/org/wso2/carbon/bam/utils/persistence/QueryManagerFactory.java?rev=113374&r1=113373&r2=113374&view=diff
==============================================================================
--- trunk/carbon/components/bam/org.wso2.carbon.bam.utils/src/main/java/org/wso2/carbon/bam/utils/persistence/QueryManagerFactory.java	(original)
+++ trunk/carbon/components/bam/org.wso2.carbon.bam.utils/src/main/java/org/wso2/carbon/bam/utils/persistence/QueryManagerFactory.java	Sun Oct  2 22:57:24 2011
@@ -15,7 +15,10 @@
  */
 package org.wso2.carbon.bam.utils.persistence;
 
+import org.wso2.carbon.bam.utils.internal.UtilsServiceComponent;
 import org.wso2.carbon.context.CarbonContext;
+import org.wso2.carbon.user.api.UserStoreException;
+import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -33,17 +36,39 @@
         return instance;
     }
 
-    public QueryManager getQueryManager() {
-        int tenantId = CarbonContext.getCurrentContext().getTenantId();
+    public QueryManager getQueryManager(String userName) throws InitializationException {
+
+        String domain = MultitenantUtils.getTenantDomain(userName);
+
+        int tenantId;
+        try {
+            tenantId = UtilsServiceComponent.getRealmService().getTenantManager().getTenantId(domain);
+        } catch (UserStoreException e) {
+            throw new InitializationException("Unable to get tenant information..", e);
+        }
+
+        //int tenantId = CarbonContext.getCurrentContext().getTenantId();
         return managerPool.get(tenantId);
     }
 
-    public QueryManager initializeQueryManager(Map<String, String> credentials) {
+    public QueryManager initializeQueryManager(Map<String, String> credentials)
+            throws InitializationException {
+
         QueryManager manager = new QueryManager();
         manager.initializeManager(credentials);
 
-        // ToDO: Get tenant ID from credentials
-        int tenantId = CarbonContext.getCurrentContext().getTenantId();
+        String domain = MultitenantUtils.getTenantDomain(credentials.get(
+                PersistencyConstants.USER_NAME));
+
+        int tenantId;
+        try {
+            tenantId = UtilsServiceComponent.getRealmService().getTenantManager().getTenantId(domain);
+        } catch (UserStoreException e) {
+            throw new InitializationException("Unable to get tenant information..", e);
+        }
+
+/*        // ToDO: Get tenant ID from credentials
+        int tenantId = CarbonContext.getCurrentContext().getTenantId();*/
         managerPool.put(tenantId, manager);
 
         return manager;