From acc159d132f7cfa6a789e32069d8e736e54b4256 Mon Sep 17 00:00:00 2001
From: Dulitha Wijewantha <dulithaz@gmail.com>
Date: Wed, 13 May 2015 22:04:15 +0530
Subject: [PATCH] * Refactored addPolicy

---
 .../carbon/policy/mgt/common/PolicyAdministratorPoint.java    | 2 ++
 .../wso2/carbon/policy/mgt/core/dao/impl/PolicyDAOImpl.java   | 2 +-
 .../policy/mgt/core/impl/PolicyAdministratorPointImpl.java    | 4 ++++
 .../carbon/policy/mgt/core/mgt/impl/PolicyManagerImpl.java    | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/PolicyAdministratorPoint.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/PolicyAdministratorPoint.java
index 7d1e7244ab..53f8411bbc 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/PolicyAdministratorPoint.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/PolicyAdministratorPoint.java
@@ -62,6 +62,8 @@ public interface PolicyAdministratorPoint {
 
     List<Policy> getPolicies() throws PolicyManagementException;
 
+    Policy getPolicy(int policyId) throws PolicyManagementException;
+
     /**
      * This method gives the device specific policy.
      *
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/PolicyDAOImpl.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/PolicyDAOImpl.java
index 27edad84f5..eef48b2710 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/PolicyDAOImpl.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/PolicyDAOImpl.java
@@ -445,11 +445,11 @@ public class PolicyDAOImpl implements PolicyDAO {
             resultSet = stmt.executeQuery();
 
             while (resultSet.next()) {
-
                 policy.setId(policyId);
                 policy.setPolicyName(resultSet.getString("NAME"));
                 policy.setTenantId(resultSet.getInt("TENANT_ID"));
                 policy.setPriorityId(resultSet.getInt("PRIORITY"));
+                policy.setProfileId(resultSet.getInt("PROFILE_ID"));
             }
             return policy;
 
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/impl/PolicyAdministratorPointImpl.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/impl/PolicyAdministratorPointImpl.java
index 0029b26983..c1c8f73d92 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/impl/PolicyAdministratorPointImpl.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/impl/PolicyAdministratorPointImpl.java
@@ -83,6 +83,10 @@ public class PolicyAdministratorPointImpl implements PolicyAdministratorPoint {
         return policyManager.getPolicies();
     }
 
+    @Override public Policy getPolicy(int policyId) throws PolicyManagementException {
+        return policyManager.getPolicy(policyId);
+    }
+
     @Override
     public List<Policy> getPoliciesOfDevice(DeviceIdentifier deviceIdentifier) throws PolicyManagementException {
         return policyManager.getPoliciesOfDevice(deviceIdentifier);
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/PolicyManagerImpl.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/PolicyManagerImpl.java
index 811a7f087c..fb8b27c2fe 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/PolicyManagerImpl.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/PolicyManagerImpl.java
@@ -372,7 +372,7 @@ public class PolicyManagerImpl implements PolicyManager {
             policyDAO.getTimesOfPolicy(policy);
             policyDAO.getLocationsOfPolicy(policy);
 
-            Profile profile = profileDAO.getProfiles(policy.getProfile().getProfileId());
+            Profile profile = profileDAO.getProfiles(policy.getProfileId());
 
             policy.setProfile(profile);
             policy.setRoles(roleNames);