Author: djencks
Date: Fri Feb 15 02:35:00 2013
New Revision: 1446433
URL: http://svn.apache.org/r1446433
Log:
FELIX-3902 fix SingleDynamic config change problem
Modified:
felix/trunk/scr/changelog.txt
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
Modified: felix/trunk/scr/changelog.txt
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/changelog.txt?rev=1446433&r1=1446432&r2=1446433&view=diff
==============================================================================
--- felix/trunk/scr/changelog.txt (original)
+++ felix/trunk/scr/changelog.txt Fri Feb 15 02:35:00 2013
@@ -16,6 +16,7 @@ Changes from 1.6.2 to 1.8
* [FELIX-3888] - [DS] Expose the insides of ScrCommand as a service
directly and enhance it
* [FELIX-3890] - [DS] We might try to unbind a service we couldn't get and
didn't bind
* [FELIX-3891] - [DS] synchronization around registerService can create
deadlocks
+ * [FELIX-3902] - [DS] Single dynamic mandatory reference problem on target
filter update
Changes from 1.6.0 to 1.6.2
---------------------------
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java?rev=1446433&r1=1446432&r2=1446433&view=diff
==============================================================================
---
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
(original)
+++
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
Fri Feb 15 02:35:00 2013
@@ -626,7 +626,7 @@ public class DependencyManager<S, T> imp
public void addedService( ServiceReference<T> serviceReference,
RefPair<T> refPair, int trackingCount )
{
boolean tracked = false;
- if ( getPreviousRefMap().get( serviceReference ) == null )
+ if ( getPreviousRefMap().remove( serviceReference ) == null )
{
if (isActive() )
{
