| commit | b1026b2ce31e23fc3c77089fbe96920812f996e7 | [log] [tgz] |
|---|---|---|
| author | Clement Escoffier <clement@apache.org> | Tue May 21 11:14:17 2013 +0000 |
| committer | Clement Escoffier <clement@apache.org> | Tue May 21 11:14:17 2013 +0000 |
| tree | 201d98a584759df0d7ccbb9df96fd5b33d0ece88 | |
| parent | d1070307262073e6b4647c47c32ea358ae9aa3ec [diff] |
Fix FELIX-4073 git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1484760 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeHandler.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeHandler.java index 4194fed..02ffe75 100644 --- a/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeHandler.java +++ b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeHandler.java
@@ -48,11 +48,11 @@ private CompositeFactory m_factory; /** - * Set the manager. - * This method me be called only once time. + * Sets the manager. + * This method must be called only once, and should not be overridden. * @param instance : the composite manager. */ - protected final void attach(ComponentInstance instance) { + protected void attach(ComponentInstance instance) { m_manager = (CompositeManager) instance; }
diff --git a/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/PrimitiveHandler.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/PrimitiveHandler.java index 2d70f25..32ef4ad 100644 --- a/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/PrimitiveHandler.java +++ b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/PrimitiveHandler.java
@@ -60,10 +60,11 @@ /** * Attaches the current handler to the given instance. + * This method must be called only once, and should not be overridden. * @param manager the instance on which the current handler will be attached. * @see org.apache.felix.ipojo.Handler#attach(org.apache.felix.ipojo.ComponentInstance) */ - protected final void attach(ComponentInstance manager) { + protected void attach(ComponentInstance manager) { m_manager = (InstanceManager) manager; m_instanceLogger = m_manager.getLogger(); }