You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2017/12/01 09:05:54 UTC
svn commit: r1816815 -
/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
Author: cziegeler
Date: Fri Dec 1 09:05:54 2017
New Revision: 1816815
URL: http://svn.apache.org/viewvc?rev=1816815&view=rev
Log:
Update change count handling
Modified:
felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
Modified: felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java?rev=1816815&r1=1816814&r2=1816815&view=diff
==============================================================================
--- felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java (original)
+++ felix/trunk/osgi-r7/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java Fri Dec 1 09:05:54 2017
@@ -728,7 +728,14 @@ public class ComponentRegistry
{
if ( changeCount == count )
{
- registration.setProperties(getServiceRegistrationProperties());
+ try
+ {
+ registration.setProperties(getServiceRegistrationProperties());
+ }
+ catch ( final IllegalStateException ise)
+ {
+ // we ignore this as this might happen on shutdown
+ }
timer.cancel();
timer = null;
}