You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ab...@apache.org on 2018/09/17 18:42:16 UTC
ranger git commit: RANGER-2186: Part II - check for NPE when
incrementing service-specific policy and tag versions after update
transaction is committed
Repository: ranger
Updated Branches:
refs/heads/master 46a75938b -> 9f639f3c5
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/9f639f3c
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/9f639f3c
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/9f639f3c
Branch: refs/heads/master
Commit: 9f639f3c5876c7134f43df33467691a2b01735a7
Parents: 46a7593
Author: Abhay Kulkarni <ak...@hortonworks.com>
Authored: Mon Sep 17 11:42:02 2018 -0700
Committer: Abhay Kulkarni <ak...@hortonworks.com>
Committed: Mon Sep 17 11:42:02 2018 -0700
----------------------------------------------------------------------
.../org/apache/ranger/biz/ServiceDBStore.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/9f639f3c/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);
+ }
}
}