felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1599633 - /felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dm/src/org/apache/felix/dm/tracker/ServiceTracker.java
Date Tue, 03 Jun 2014 15:52:39 GMT
Author: pderop
Date: Tue Jun  3 15:52:38 2014
New Revision: 1599633

URL: http://svn.apache.org/r1599633
Log:
Added a null-check when commandActionSet is null (in the Tracked.serviceChangedHideAspects
method).
This might require some code review.

Modified:
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dm/src/org/apache/felix/dm/tracker/ServiceTracker.java

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dm/src/org/apache/felix/dm/tracker/ServiceTracker.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dm/src/org/apache/felix/dm/tracker/ServiceTracker.java?rev=1599633&r1=1599632&r2=1599633&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dm/src/org/apache/felix/dm/tracker/ServiceTracker.java
(original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dm/src/org/apache/felix/dm/tracker/ServiceTracker.java
Tue Jun  3 15:52:38 2014
@@ -1256,14 +1256,16 @@ public class ServiceTracker implements S
 				// schedule the actionset for execution. We'll use a serial executor to prevent the actions
to
 				// be performed out of order.
 				final AbstractCustomizerActionSet commandActionSet = actionSet;
-				getExecutor().schedule(new Runnable() {
+				if (commandActionSet != null) {
+                    getExecutor().schedule(new Runnable() {
 
-					@Override
-					public void run() {
-						commandActionSet.execute();
-					}
-					
-				});
+                        @Override
+                        public void run() {
+                            commandActionSet.execute();
+                        }
+
+                    });
+				}
 			}
 			getExecutor().execute();
 		}



Mime
View raw message