You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2016/09/24 21:09:20 UTC
svn commit: r1762151 - in /felix/trunk/dependencymanager:
org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/
org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/
org.apache.felix.dependencymanager/test/test/
Author: pderop
Date: Sat Sep 24 21:09:20 2016
New Revision: 1762151
URL: http://svn.apache.org/viewvc?rev=1762151&view=rev
Log:
FELIX-5274: remove callback fails after manually removing dynamic dependencies (the DM state machine is now not reentrant anymore).
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5274_CleanupInstanceBoundDependenciesInDestroy.java
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/ComponentTest.java
Added: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5274_CleanupInstanceBoundDependenciesInDestroy.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5274_CleanupInstanceBoundDependenciesInDestroy.java?rev=1762151&view=auto
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5274_CleanupInstanceBoundDependenciesInDestroy.java (added)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5274_CleanupInstanceBoundDependenciesInDestroy.java Sat Sep 24 21:09:20 2016
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.dm.itest.api;
+
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.itest.util.Ensure;
+import org.apache.felix.dm.itest.util.TestBase;
+
+/**
+ * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
+ */
+public class FELIX5274_CleanupInstanceBoundDependenciesInDestroy extends TestBase {
+ Ensure m_ensure;
+
+ public void testInstanceBoundDependencyNotReAddedTwice() {
+ DependencyManager m = getDM();
+ m_ensure = new Ensure();
+
+ A aObject = new A();
+ Component a = m.createComponent()
+ .setImplementation(aObject)
+ .add(m.createServiceDependency().setService(B.class).setRequired(true).setCallbacks("bindB", "unbindB"));
+
+ Component b = m.createComponent()
+ .setImplementation(new B())
+ .setInterface(B.class.getName(), null);
+
+ Component c = m.createComponent()
+ .setImplementation(new C())
+ .setInterface(C.class.getName(), null);
+
+ m.add(b);
+ m.add(a);
+ m.add(c);
+
+ m.remove(b);
+ m_ensure.waitForStep(5, 3000);
+ m.add(b);
+ m_ensure.waitForStep(8, 3000);
+ aObject.testDone();
+ m.clear();
+ }
+
+ public class A {
+ private Ensure.Steps m_stepsBindB = new Ensure.Steps(1, 6);
+ private Ensure.Steps m_stepsUnbindB = new Ensure.Steps(5);
+ private Ensure.Steps m_stepsBindC = new Ensure.Steps(3, 8);
+ private Ensure.Steps m_stepsUnbindC = new Ensure.Steps(4);
+ private Ensure.Steps m_stepsInit = new Ensure.Steps(2, 7);
+ private Dependency m_depC;
+ private boolean m_done;
+
+ void bindB(B b) {
+ m_ensure.steps(m_stepsBindB);
+ }
+
+ public void testDone() {
+ m_done = true;
+ }
+
+ void unbindB(B b) {
+ if (! m_done) m_ensure.steps(m_stepsUnbindB);
+ }
+
+ void init(Component component) {
+ DependencyManager dm = component.getDependencyManager();
+ m_depC = dm.createServiceDependency().setService(C.class).setRequired(true).setCallbacks("bindC", "unbindC");
+ m_ensure.steps(m_stepsInit);
+ component.add(m_depC);
+ }
+
+ void destroy(Component component) {
+ component.remove(m_depC);
+ }
+
+ void bindC(C c) {
+ m_ensure.steps(m_stepsBindC);
+ }
+
+ void unbindC(C c) {
+ if (! m_done) m_ensure.steps(m_stepsUnbindC);
+ }
+ }
+
+ public static class B {
+
+ }
+
+ public static class C {
+
+ }
+}
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java?rev=1762151&r1=1762150&r2=1762151&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java Sat Sep 24 21:09:20 2016
@@ -913,6 +913,9 @@ public class ComponentImpl implements Co
* Runs the state machine, to see if a change event has to trigger some component state transition.
*/
private void handleChange() {
+ if (isHandlingChange()) {
+ return;
+ }
m_logger.debug("handleChanged");
handlingChange(true);
try {
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/ComponentTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/ComponentTest.java?rev=1762151&r1=1762150&r2=1762151&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/ComponentTest.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager/test/test/ComponentTest.java Sat Sep 24 21:09:20 2016
@@ -130,17 +130,17 @@ public class ComponentTest {
}
void destroy() {
System.out.println("destroy");
- e.step(9);
+ e.step(7);
}
});
e.step(1);
c.start();
- e.step(5);
+ e.step(3);
d2.add(new EventImpl());
- e.step(7);
+ e.step(5);
d.remove(new EventImpl());
c.stop();
- e.step(10);
+ e.step(8);
}
@Test