You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/12/02 10:40:45 UTC

svn commit: r1772326 - in /sling/trunk/testing/mocks: osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java sling-mock/pom.xml

Author: sseifert
Date: Fri Dec  2 10:40:45 2016
New Revision: 1772326

URL: http://svn.apache.org/viewvc?rev=1772326&view=rev
Log:
SLING-6356 osgi-mock: Fallback to default when reference field collection type is missing in SCR metadata

Modified:
    sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java
    sling/trunk/testing/mocks/sling-mock/pom.xml

Modified: sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java?rev=1772326&r1=1772325&r2=1772326&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java (original)
+++ sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java Fri Dec  2 10:40:45 2016
@@ -524,7 +524,7 @@ final class OsgiMetadataUtil {
                     return item;
                 }
             }
-            return null;
+            return FieldCollectionType.SERVICE;
         }
 
     }

Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1772326&r1=1772325&r2=1772326&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Fri Dec  2 10:40:45 2016
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
-            <version>2.1.0</version>
+            <version>2.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>