You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by th...@apache.org on 2012/08/31 11:02:27 UTC
svn commit: r1379373 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak:
osgi/OsgiIndexProvider.java plugins/index/Indexer.java
Author: thomasm
Date: Fri Aug 31 09:02:26 2012
New Revision: 1379373
URL: http://svn.apache.org/viewvc?rev=1379373&view=rev
Log:
OAK-28 Query implementation
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiIndexProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Indexer.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiIndexProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiIndexProvider.java?rev=1379373&r1=1379372&r2=1379373&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiIndexProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiIndexProvider.java Fri Aug 31 09:02:26 2012
@@ -84,7 +84,7 @@ public class OsgiIndexProvider implement
if (providers.isEmpty()) {
return Collections.emptyList();
} else if (providers.size() == 1) {
- return providers.get(0).getQueryIndexes(mk);
+ return providers.entrySet().iterator().next().getValue().getQueryIndexes(mk);
} else {
// TODO combine indexes
return null;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Indexer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Indexer.java?rev=1379373&r1=1379372&r2=1379373&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Indexer.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Indexer.java Fri Aug 31 09:02:26 2012
@@ -416,6 +416,8 @@ public class Indexer implements QueryInd
// unexpected but possible
// this will cause all indexes to be removed, so
// it can be ignored here
+ } else {
+ throw e;
}
}
}