You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by me...@apache.org on 2018/09/19 05:37:35 UTC
[3/4] ranger git commit: RANGER-2186: Part II - check for NPE when
incrementing service-specific policy and tag versions after update
transaction is committed
RANGER-2186: Part II - check for NPE when incrementing service-specific policy and tag versions after update transaction is committed
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/8e10e20a
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/8e10e20a
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/8e10e20a
Branch: refs/heads/ranger-1
Commit: 8e10e20aff5575c541c52f515f2c50292326d7a0
Parents: 6b5d787
Author: Abhay Kulkarni <ak...@hortonworks.com>
Authored: Mon Sep 17 11:42:02 2018 -0700
Committer: Mehul Parikh <me...@apache.org>
Committed: Wed Sep 19 11:06:23 2018 +0530
----------------------------------------------------------------------
.../org/apache/ranger/biz/ServiceDBStore.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/8e10e20a/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 32af4cd..6c699ca 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
@@ -2880,14 +2880,16 @@ public class ServiceDBStore extends AbstractServiceStore {
} else {
XXService service = daoMgr.getXXService().getById(id);
- serviceVersionInfoDbObj = new XXServiceVersionInfo();
- serviceVersionInfoDbObj.setServiceId(service.getId());
- serviceVersionInfoDbObj.setPolicyVersion(1L);
- serviceVersionInfoDbObj.setPolicyUpdateTime(new Date());
- serviceVersionInfoDbObj.setTagVersion(1L);
- serviceVersionInfoDbObj.setTagUpdateTime(new Date());
-
- serviceVersionInfoDao.create(serviceVersionInfoDbObj);
+ if (service != null) {
+ serviceVersionInfoDbObj = new XXServiceVersionInfo();
+ serviceVersionInfoDbObj.setServiceId(service.getId());
+ serviceVersionInfoDbObj.setPolicyVersion(1L);
+ serviceVersionInfoDbObj.setPolicyUpdateTime(new Date());
+ serviceVersionInfoDbObj.setTagVersion(1L);
+ serviceVersionInfoDbObj.setTagUpdateTime(new Date());
+
+ serviceVersionInfoDao.create(serviceVersionInfoDbObj);
+ }
}
}