You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/04/26 17:46:34 UTC
[4/4] syncope git commit: Preventing NPE for bad search queries
Preventing NPE for bad search queries
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8dc9ec5f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8dc9ec5f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8dc9ec5f
Branch: refs/heads/master
Commit: 8dc9ec5f75af0bfbd67f7daf897ee1d80bf5ef75
Parents: 22b893d
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Apr 26 13:48:51 2016 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Apr 26 17:46:19 2016 +0200
----------------------------------------------------------------------
.../apache/syncope/core/rest/cxf/service/AbstractAnyService.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/8dc9ec5f/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractAnyService.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractAnyService.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractAnyService.java
index ca00e69..f58e7a0 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractAnyService.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractAnyService.java
@@ -131,7 +131,9 @@ public abstract class AbstractAnyService<TO extends AnyTO, P extends AnyPatch>
String realm = StringUtils.prependIfMissing(searchQuery.getRealm(), SyncopeConstants.ROOT_REALM);
// if an assignable query is provided in the FIQL string, start anyway from root realm
- boolean isAssignableCond = -1 != searchQuery.getFiql().indexOf(SpecialAttr.ASSIGNABLE.toString());
+ boolean isAssignableCond = searchQuery.getFiql() == null
+ ? false
+ : -1 != searchQuery.getFiql().indexOf(SpecialAttr.ASSIGNABLE.toString());
SearchCond cond = getSearchCond(searchQuery.getFiql(), realm);
return buildPagedResult(