Repository: incubator-ranger Updated Branches: refs/heads/master a4140bc0b -> a01cce386
RANGER-1000 : Tag service deletion failure due to MySQLIntegrityConstraintViolationException Signed-off-by: Velmurugan Periasamy <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/a01cce38 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/a01cce38 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/a01cce38 Branch: refs/heads/master Commit: a01cce386a83b6f5f8384b94296c51a45b555536 Parents: a4140bc Author: pradeep agrawal <[email protected]> Authored: Tue Jun 7 10:15:07 2016 +0530 Committer: Velmurugan Periasamy <[email protected]> Committed: Tue Jun 7 08:19:52 2016 -0400 ---------------------------------------------------------------------- .../ranger/plugin/model/validation/RangerPolicyValidator.java | 2 +- .../src/main/resources/conf.dist/ranger-admin-default-site.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a01cce38/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java index 35b2726..a89ec19 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java @@ -251,7 +251,7 @@ public class RangerPolicyValidator extends RangerValidator { RangerServiceDef serviceDef = null; int policyItemsCount = 0; - int policyType=policy.getPolicyType(); + int policyType=policy.getPolicyType() == null ? RangerPolicy.POLICY_TYPE_ACCESS : policy.getPolicyType(); switch (policyType) { case RangerPolicy.POLICY_TYPE_DATAMASK: if (CollectionUtils.isNotEmpty(policy.getDataMaskPolicyItems())) http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a01cce38/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml ---------------------------------------------------------------------- diff --git a/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml b/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml index 75c67d3..a2ed79a 100644 --- a/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml +++ b/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml @@ -481,7 +481,7 @@ </property> <property> <name>ranger.rest-csrf.browser-useragents-regex</name> - <value>^Mozilla.*,^Opera.*</value> + <value>^Mozilla.*,^Opera.*,^Chrome.*</value> </property> </configuration>
