Repository: incubator-ranger Updated Branches: refs/heads/ranger-0.5 7bce05377 -> c82c0c8c5
RANGER-687: Service update should ignore user provided values for internal fields - like policyVersion (cherry picked from commit 8f07737f97c111eb6c088917076a2d86eb117a86) Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/c82c0c8c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/c82c0c8c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/c82c0c8c Branch: refs/heads/ranger-0.5 Commit: c82c0c8c5c1f5d4b7e5673c5c32df9d345961f69 Parents: 7bce053 Author: Madhan Neethiraj <[email protected]> Authored: Wed Oct 14 23:39:45 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Thu Oct 15 18:02:53 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/ranger/biz/ServiceDBStore.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c82c0c8c/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 d796456..dad652d 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 @@ -1121,6 +1121,12 @@ public class ServiceDBStore implements ServiceStore { service = svcServiceWithAssignedId.update(service); svcServiceWithAssignedId.setPopulateExistingBaseFields(false); } else { + service.setCreateTime(existing.getCreateTime()); + service.setGuid(existing.getGuid()); + service.setVersion(existing.getVersion()); + service.setPolicyUpdateTime(existing.getPolicyUpdateTime()); + service.setPolicyVersion(existing.getPolicyVersion()); + service = svcService.update(service); }
