You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/02/17 07:59:38 UTC

svn commit: r1660303 - /felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java

Author: cziegeler
Date: Tue Feb 17 06:59:38 2015
New Revision: 1660303

URL: http://svn.apache.org/r1660303
Log:
FELIX-4785 : Incompatible SCR API

Modified:
    felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java

Modified: felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java?rev=1660303&r1=1660302&r2=1660303&view=diff
==============================================================================
--- felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java (original)
+++ felix/trunk/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java Tue Feb 17 06:59:38 2015
@@ -259,7 +259,7 @@ public class ScrServiceImpl implements S
 
         public ComponentInstance getComponentInstance()
         {
-            // TODO - how do we want to enable this?
+            // returning null as we should have never returned this in the first place
             return null;
         }
 
@@ -306,12 +306,12 @@ public class ScrServiceImpl implements S
 
         public void enable()
         {
-            this.runtime.enableComponent(this.description);
+            // noop as the old model was broken
         }
 
         public void disable()
         {
-            this.runtime.disableComponent(this.description);
+            // noop as the old model was broken
         }
     }