You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by bo...@apache.org on 2017/01/02 18:57:44 UTC

incubator-ranger git commit: RANGER-1270:IndexOutOfBoundsException when test connection in Ranger-Solr-Plugin

Repository: incubator-ranger
Updated Branches:
  refs/heads/master 629e20078 -> 85093b8b4


RANGER-1270:IndexOutOfBoundsException when test connection in Ranger-Solr-Plugin

Signed-off-by: Don Bosco Durai <bo...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/85093b8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/85093b8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/85093b8b

Branch: refs/heads/master
Commit: 85093b8b4f99775d0ab08428d2184a77ec3da7f8
Parents: 629e200
Author: 10209833 <ji...@zte.com.cn>
Authored: Wed Dec 28 09:57:49 2016 +0800
Committer: Don Bosco Durai <bo...@apache.org>
Committed: Mon Jan 2 10:57:10 2017 -0800

----------------------------------------------------------------------
 .../ranger/services/solr/client/ServiceSolrClient.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/85093b8b/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java
----------------------------------------------------------------------
diff --git a/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java b/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java
index 58e539e..74da115 100644
--- a/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java
+++ b/plugin-solr/src/main/java/org/apache/ranger/services/solr/client/ServiceSolrClient.java
@@ -42,6 +42,7 @@ import org.apache.solr.client.solrj.response.CoreAdminResponse;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.params.CoreAdminParams.CoreAdminAction;
 import org.apache.solr.common.util.SimpleOrderedMap;
+import org.apache.commons.collections.CollectionUtils;
 
 public class ServiceSolrClient {
 	private static final Logger LOG = Logger.getLogger(ServiceSolrClient.class);
@@ -103,10 +104,14 @@ public class ServiceSolrClient {
 		SolrResponse response = request.process(solrClient);
 
 		List<String> list = new ArrayList<String>();
-		for (int i = 0; i < response.getResponse().size(); i++) {
+		List<String> responseCollectionList = (ArrayList<String>)response.getResponse().get("collections");
+		if(CollectionUtils.isEmpty(responseCollectionList)) {
+			return list;
+		}
+		for (int i = 0; i < responseCollectionList.size(); i++) {
 			if (ignoreCollectionList == null
-					|| !ignoreCollectionList.contains(list.get(i))) {
-				list.add(list.get(i));
+					|| !ignoreCollectionList.contains(responseCollectionList.get(i))) {
+				list.add(responseCollectionList.get(i));
 			}
 		}
 		return list;