jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1381303 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java
Date Wed, 05 Sep 2012 19:13:39 GMT
Author: jukka
Date: Wed Sep  5 19:13:38 2012
New Revision: 1381303

URL: http://svn.apache.org/viewvc?rev=1381303&view=rev
Log:
OAK-270: Enforce uniqueness of jcr:uuid

Adjust concurrently committed code to match the updated interface

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java?rev=1381303&r1=1381302&r2=1381303&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java
Wed Sep  5 19:13:38 2012
@@ -47,10 +47,10 @@ public class CompositeQueryIndexProvider
     }
 
     @Override
-    public List<QueryIndex> getQueryIndexes(MicroKernel mk) {
+    public List<? extends QueryIndex> getQueryIndexes(MicroKernel mk) {
         List<QueryIndex> indexes = new ArrayList<QueryIndex>();
         for (QueryIndexProvider qip : providers) {
-            List<QueryIndex> t = qip.getQueryIndexes(mk);
+            List<? extends QueryIndex> t = qip.getQueryIndexes(mk);
             if (t != null) {
                 indexes.addAll(t);
             }



Mime
View raw message