RANGER-687: Service update should ignore user provided values for internal fields - like policyVersion
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/8f07737f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/8f07737f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/8f07737f Branch: refs/heads/tag-policy Commit: 8f07737f97c111eb6c088917076a2d86eb117a86 Parents: 1f43245 Author: Madhan Neethiraj <[email protected]> Authored: Wed Oct 14 23:39:45 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Thu Oct 15 16:03:14 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/8f07737f/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 a5ac557..6e07e4e 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 @@ -1126,6 +1126,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); }
