commit 08615d21e6c28edeb6e05159cf4b6982ce6d9468
author Xander Uiterlinden <uiterlix@apache.org> Fri Apr 20 13:07:07 2012 +0000
committer Xander Uiterlinden <uiterlix@apache.org> Fri Apr 20 13:07:07 2012 +0000
tree 505d89656eefb32870aa8f9bfa2ff03e5d6c5a0b
parent 90e9792a024b27132af97c1cfc59373cec3fde2b

Fixed bug in swapped callback of AbstractDecorator. Instead of really swapping it re-added the old service instead of the new one.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1328364 13f79535-47bb-0310-9956-ffa450edef68

dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java

diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java
index 991fe90..34078bf 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/AbstractDecorator.java
@@ -221,7 +221,11 @@
     public void swapped(ServiceReference oldRef, Object oldService, ServiceReference newRef, Object newService) {
         synchronized (m_services) {
         	Component service = (Component) m_services.remove(oldRef);
-        	m_services.put(newRef, service);
+            if (service == null) {
+                throw new IllegalStateException("Service should not be null here.");
+            }
+        	Component newComponent = createService(new Object[] { newRef, newService });
+        	m_services.put(newRef, newComponent);
         }
     }