svn commit: r1772122 - in /sling/trunk/contrib/extensions/contextaware-config/impl/src: main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java

[sseifert]

Author: sseifert
Date: Wed Nov 30 21:22:36 2016
New Revision: 1772122

URL: http://svn.apache.org/viewvc?rev=1772122&view=rev
Log:
SLING-6347 do not return "*" when no collection item name exists

Modified:
    
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
    
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java

Modified: 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java?rev=1772122&r1=1772121&r2=1772122&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
 Wed Nov 30 21:22:36 2016
@@ -93,7 +93,7 @@ final class ConfigurationDataImpl implem
                 contextResource, configName,
                 configurationManager, configurationOverrideManager,
                 configurationPersistenceStrategy,
-                configResourceCollection, "*");
+                configResourceCollection, null);
     }
     
     void setConfigMetadata(ConfigurationMetadata configMetadata) {

Modified: 
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java?rev=1772122&r1=1772121&r2=1772122&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java
 (original)
+++ 
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java
 Wed Nov 30 21:22:36 2016
@@ -150,7 +150,7 @@ public class ConfigurationDataImplTest {
                 false);
         
         assertEquals("test", underTest.getConfigName());
-        assertEquals("*", underTest.getCollectionItemName());
+        assertNull(underTest.getCollectionItemName());
         
         assertEquals(ImmutableSet.of("prop1", "prop2", "prop3"), 
underTest.getPropertyNames());