FELIX-3535 remove use of obsolete state code
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1346203 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/Component.java b/scr/src/main/java/org/apache/felix/scr/Component.java
index 302b89f..86c54a8 100644
--- a/scr/src/main/java/org/apache/felix/scr/Component.java
+++ b/scr/src/main/java/org/apache/felix/scr/Component.java
@@ -43,6 +43,7 @@
* The Component is being enabled (value is 512). After the component has
* been enabled it enters the {@link #STATE_UNSATISFIED} state.
* @since 1.2
+ * @deprecated since 7.0
*/
static final int STATE_ENABLING = 512;
@@ -65,6 +66,7 @@
* The Component is currently being activated either because it has been
* enabled or because any dependency which was previously unsatisfied has
* become satisfied (value is 8).
+ * @deprecated since 7.0
*/
static final int STATE_ACTIVATING = 8;
@@ -96,6 +98,7 @@
* The Component is being deactivated either because it is being disabled
* or because a dependency is not satisfied any more (value is 128). After
* deactivation the Component enters the {@link #STATE_UNSATISFIED} state.
+ * @deprecated since 7.0
*/
static final int STATE_DEACTIVATING = 128;
@@ -103,6 +106,7 @@
* The Component is being disabled (value is 1024). After the component has
* been disabled it enters the {@link #STATE_DISABLED} state.
* @since 1.2
+ * @deprecated since 7.0
*/
static final int STATE_DISABLING = 1024;
@@ -110,6 +114,7 @@
* The Component is being disposed off (value is 2048). After the component
* has been disposed off it enters the {@link #STATE_DESTROYED} state.
* @since 1.2
+ * @deprecated since 7.0
*/
static final int STATE_DISPOSING = 2048;
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java b/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java
index 498915b..1329d37 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java
@@ -384,28 +384,29 @@
{
case Component.STATE_DISABLED:
return "disabled";
- case Component.STATE_ENABLING:
- return "enabling";
- case Component.STATE_ENABLED:
- return "enabled";
case Component.STATE_UNSATISFIED:
return "unsatisfied";
- case Component.STATE_ACTIVATING:
- return "activating";
case Component.STATE_ACTIVE:
return "active";
case Component.STATE_REGISTERED:
return "registered";
case Component.STATE_FACTORY:
return "factory";
+ case Component.STATE_DISPOSED:
+ return "disposed";
+
+ case Component.STATE_ENABLING:
+ return "enabling";
+ case Component.STATE_ENABLED:
+ return "enabled";
+ case Component.STATE_ACTIVATING:
+ return "activating";
case Component.STATE_DEACTIVATING:
return "deactivating";
case Component.STATE_DISABLING:
return "disabling";
case Component.STATE_DISPOSING:
return "disposing";
- case Component.STATE_DISPOSED:
- return "disposed";
default:
return String.valueOf(state);
}
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
index 6dc7854..7d2080b 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
@@ -55,7 +55,7 @@
public class DependencyManager implements ServiceListener, Reference
{
// mask of states ok to send events
- private static final int STATE_MASK = Component.STATE_UNSATISFIED | Component.STATE_ACTIVATING
+ private static final int STATE_MASK = Component.STATE_UNSATISFIED
| Component.STATE_ACTIVE | Component.STATE_REGISTERED | Component.STATE_FACTORY;
// pseudo service to mark a bound service without actual service instance
@@ -1110,35 +1110,13 @@
null );
return false;
}
- else if ( !m_componentManager.getComponentMetadata().isImmediate() )
- {
- m_componentManager.log( LogService.LOG_DEBUG,
- "DependencyManager : Delayed component not yet created, assuming bind method call succeeded",
- null );
-
- return true;
- }
- else if ( m_componentManager.getState() == AbstractComponentManager.STATE_ACTIVATING )
- {
- // when activating the method, events may be handled before the
- // open(Object) method has been called on this instance. This is
- // not a problem, because the open(Object) method will catch up
- // this services any way
- m_componentManager.log( LogService.LOG_DEBUG, "DependencyManager : Not yet open for activating component",
- null );
-
- return true;
- }
else
{
- // this is not expected: if the component is immediate the
- // implementationObject is not null (asserted by the caller)
-
- m_componentManager.log( LogService.LOG_ERROR,
- "DependencyManager : Immediate component not yet created, bind method cannot be called",
+ m_componentManager.log( LogService.LOG_DEBUG,
+ "DependencyManager : component not yet created, assuming bind method call succeeded",
null );
- return false;
+ return true;
}
}