You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dj...@apache.org on 2014/08/06 04:59:17 UTC

svn commit: r1616084 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java

Author: djencks
Date: Wed Aug  6 02:59:17 2014
New Revision: 1616084

URL: http://svn.apache.org/r1616084
Log:
FELIX-4149 only allow configurable service properties for singleton components

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java?rev=1616084&r1=1616083&r2=1616084&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java Wed Aug  6 02:59:17 2014
@@ -920,6 +920,10 @@ public class ComponentMetadata
         {
         	m_configurableServiceProperties = true;
         }
+        if ( m_configurableServiceProperties && getServiceScope() != Scope.singleton )
+        {
+            throw validationFailure( "configurable service properties only allowed with singleton scope" );
+        }
         if (m_dsVersion.isDS13())
         {
         	m_deleteCallsModify = true; //spec behavior as of 1.3