Repository: incubator-geode
Updated Branches:
  refs/heads/develop 3d0dc7492 -> 718bdfcc0


GEODE-37 re-merge commit 6a109a7f57a5402af458d593d93c2e328bd3281b

This was missed during package rename merge


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/718bdfcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/718bdfcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/718bdfcc

Branch: refs/heads/develop
Commit: 718bdfcc05f9de1220e72ac5caa5412ce1f3644d
Parents: 3d0dc74
Author: Hitesh Khamesra <hkhame...@pivotal.io>
Authored: Mon Sep 19 11:52:18 2016 -0700
Committer: Hitesh Khamesra <hkhame...@pivotal.io>
Committed: Mon Sep 19 11:52:18 2016 -0700

----------------------------------------------------------------------
 .../geode/cache/query/internal/IndexTrackingQueryObserver.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/718bdfcc/geode-core/src/main/java/org/apache/geode/cache/query/internal/IndexTrackingQueryObserver.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/IndexTrackingQueryObserver.java
 
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/IndexTrackingQueryObserver.java
index 1650269..a865dac 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/IndexTrackingQueryObserver.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/IndexTrackingQueryObserver.java
@@ -55,7 +55,7 @@ public class IndexTrackingQueryObserver extends 
QueryObserverAdapter {
     String indexName;
     //Dont create new IndexInfo if one is already there in map for aggregation
     //of results later for whole partition region on this node.
-    if(index instanceof MapRangeIndex || index instanceof 
CompactMapRangeIndex){
+    if((index instanceof MapRangeIndex || index instanceof 
CompactMapRangeIndex) && key instanceof Object[]){
       indexName = index.getName()+ "-"+((Object[])key)[1];
     } else {
       indexName = index.getName();

Reply via email to