You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sn...@apache.org on 2015/04/08 09:04:06 UTC
incubator-ranger git commit: RANGER-380: Fixed Case sensitive
comparision - removed a possiblity of NPE
Repository: incubator-ranger
Updated Branches:
refs/heads/master c50acc448 -> 4b0fd5dc8
RANGER-380: Fixed Case sensitive comparision - removed a possiblity of NPE
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/4b0fd5dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/4b0fd5dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/4b0fd5dc
Branch: refs/heads/master
Commit: 4b0fd5dc874fbfb6952746413b2ff2caa17580b1
Parents: c50acc4
Author: sneethiraj <sn...@apache.org>
Authored: Wed Apr 8 02:56:39 2015 -0400
Committer: sneethiraj <sn...@apache.org>
Committed: Wed Apr 8 02:56:39 2015 -0400
----------------------------------------------------------------------
.../org/apache/ranger/common/RangerSearchUtil.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/4b0fd5dc/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
index 8b98ac9..fddd3e0 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
@@ -92,8 +92,11 @@ public class RangerSearchUtil extends SearchUtil {
ret.setParam(SearchFilter.SERVICE_NAME, request.getParameter("name"));
ret.setParam(SearchFilter.IS_ENABLED, request.getParameter("status"));
- ret.setParam(SearchFilter.SERVICE_TYPE, request.getParameter("type").toLowerCase());
-
+ String serviceType = request.getParameter("type") ;
+ if (serviceType != null) {
+ serviceType = serviceType.toLowerCase() ;
+ }
+ ret.setParam(SearchFilter.SERVICE_TYPE,serviceType) ;
extractCommonCriteriasForFilter(request, ret, sortFields);
return ret;
@@ -111,7 +114,12 @@ public class RangerSearchUtil extends SearchUtil {
ret.setParams(new HashMap<String, String>());
}
- ret.setParam(SearchFilter.SERVICE_TYPE, request.getParameter("repositoryType").toLowerCase());
+ String repositoryType = request.getParameter("repositoryType") ;
+
+ if (repositoryType != null) {
+ repositoryType = repositoryType.toLowerCase() ;
+ }
+ ret.setParam(SearchFilter.SERVICE_TYPE, repositoryType) ;
ret.setParam(SearchFilter.SERVICE_NAME, request.getParameter("repositoryName"));
ret.setParam(SearchFilter.SERVICE_ID, request.getParameter("repositoryId"));
ret.setParam(SearchFilter.POLICY_NAME, request.getParameter("policyName"));