community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to the timestamp and filters

Browse Source
This commit is contained in:
Dulitha Wijewantha 2015-05-21 16:48:49 +05:30
parent c8affcf836
commit 341abb47ab
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/impl/PolicyFilterImpl.java
View File

@ -60,13 +60,13 @@ public class PolicyFilterImpl implements PolicyFilter {
@Override
public void filterOwnershipTypeBasedPolicies(String ownershipType, List<Policy> policies) {
List<Policy> temp = new ArrayList<Policy>();
for (Policy policy : policies) {
if (ownershipType.equalsIgnoreCase(policy.getOwnershipType())) {
temp.add(policy);
}
}
policies = temp;
// List<Policy> temp = new ArrayList<Policy>();
// for (Policy policy : policies) {
// if (ownershipType.equalsIgnoreCase(policy.getOwnershipType())) {
// temp.add(policy);
// }
// }
// policies = temp;
}
@Override

14
components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/PolicyManagerImpl.java
View File

@ -30,7 +30,9 @@ import org.wso2.carbon.policy.mgt.core.dao.*;
import org.wso2.carbon.policy.mgt.core.mgt.PolicyManager;
import org.wso2.carbon.policy.mgt.core.mgt.ProfileManager;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
public class PolicyManagerImpl implements PolicyManager {
@ -58,9 +60,15 @@ public class PolicyManagerImpl implements PolicyManager {
try {
PolicyManagementDAOFactory.beginTransaction();
if (policy.getProfile() != null && policy.getProfile().getProfileId() == 0) {
profileDAO.addProfile(policy.getProfile());
featureDAO.addProfileFeatures(policy.getProfile().getProfileFeaturesList(),
policy.getProfile().getProfileId());
Profile profile = policy.getProfile();
Timestamp currentTimestamp = new Timestamp(Calendar.getInstance().getTime().getTime());
profile.setCreatedDate(currentTimestamp);
profile.setUpdatedDate(currentTimestamp);
profileDAO.addProfile(profile);
featureDAO.addProfileFeatures(profile.getProfileFeaturesList(), profile.getProfileId());
}
policy = policyDAO.addPolicy(policy);