You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ve...@apache.org on 2017/02/10 23:02:52 UTC

ranger git commit: RANGER-1366: Plugin-status page shows incorrect last-update time

Repository: ranger
Updated Branches:
  refs/heads/master 543b591d5 -> fbc7f19db


RANGER-1366: Plugin-status page shows incorrect last-update time

Signed-off-by: Velmurugan Periasamy <ve...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/fbc7f19d
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/fbc7f19d
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/fbc7f19d

Branch: refs/heads/master
Commit: fbc7f19db32200bc35211cbe6c309e8a3e53fed0
Parents: 543b591
Author: Abhay Kulkarni <ak...@hortonworks.com>
Authored: Wed Feb 8 16:28:58 2017 -0800
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Fri Feb 10 18:02:40 2017 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/ranger/biz/ServiceDBStore.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ranger/blob/fbc7f19d/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index cb67b6a..15f205a 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@ -2690,8 +2690,8 @@ public class ServiceDBStore extends AbstractServiceStore {
 			serviceVersionInfoDbObj = new XXServiceVersionInfo();
 			serviceVersionInfoDbObj.setServiceId(serviceDbObj.getId());
 			serviceVersionInfoDbObj.setPolicyVersion(getNextVersion(serviceDbObj.getPolicyVersion()));
-			serviceVersionInfoDbObj.setTagVersion(serviceDbObj.getTagVersion());
 			serviceVersionInfoDbObj.setPolicyUpdateTime(new Date());
+			serviceVersionInfoDbObj.setTagVersion(serviceDbObj.getTagVersion());
 			serviceVersionInfoDbObj.setTagUpdateTime(serviceDbObj.getTagUpdateTime());
 
 			serviceVersionInfoDao.create(serviceVersionInfoDbObj);
@@ -2709,11 +2709,11 @@ public class ServiceDBStore extends AbstractServiceStore {
 					if (serviceVersionInfoDbObj != null) {
 
 						serviceVersionInfoDbObj.setPolicyVersion(getNextVersion(serviceVersionInfoDbObj.getPolicyVersion()));
-						serviceVersionInfoDbObj.setPolicyUpdateTime(service.getPolicyUpdateTime());
+						serviceVersionInfoDbObj.setPolicyUpdateTime(new Date());
 
 						if (filterForServicePlugin && isTagVersionUpdateNeeded) {
 							serviceVersionInfoDbObj.setTagVersion(getNextVersion(serviceVersionInfoDbObj.getTagVersion()));
-							serviceVersionInfoDbObj.setTagUpdateTime(service.getTagUpdateTime());
+							serviceVersionInfoDbObj.setTagUpdateTime(new Date());
 						}
 						serviceVersionInfoDao.update(serviceVersionInfoDbObj);
 					} else {
@@ -2721,14 +2721,14 @@ public class ServiceDBStore extends AbstractServiceStore {
 						serviceVersionInfoDbObj = new XXServiceVersionInfo();
 						serviceVersionInfoDbObj.setServiceId(referringService.getId());
 						serviceVersionInfoDbObj.setPolicyVersion(getNextVersion(referringService.getPolicyVersion()));
+						serviceVersionInfoDbObj.setPolicyUpdateTime(new Date());
 						if (filterForServicePlugin && isTagVersionUpdateNeeded) {
 							serviceVersionInfoDbObj.setTagVersion(getNextVersion(referringService.getTagVersion()));
+							serviceVersionInfoDbObj.setTagUpdateTime(new Date());
 						} else {
 							serviceVersionInfoDbObj.setTagVersion(referringService.getTagVersion());
+							serviceVersionInfoDbObj.setTagUpdateTime(referringService.getTagUpdateTime());
 						}
-						serviceVersionInfoDbObj.setPolicyUpdateTime(new Date());
-						serviceVersionInfoDbObj.setTagUpdateTime(referringService.getTagUpdateTime());
-
 						serviceVersionInfoDao.create(serviceVersionInfoDbObj);
 					}
 				}