You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by js...@apache.org on 2015/09/04 15:33:03 UTC
svn commit: r1701254 -
/sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java
Author: jsedding
Date: Fri Sep 4 13:33:02 2015
New Revision: 1701254
URL: http://svn.apache.org/r1701254
Log:
SLING-4981 - Deadlock involving Scheduler Whiteboard
- remove synchronized from ServiceTrackerCustomizer
Modified:
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java
Modified: sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java?rev=1701254&r1=1701253&r2=1701254&view=diff
==============================================================================
--- sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java (original)
+++ sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WhiteboardHandler.java Fri Sep 4 13:33:02 2015
@@ -63,17 +63,17 @@ public class WhiteboardHandler {
"(" + Constants.OBJECTCLASS + "=" + Job.class.getName() + "))"),
new ServiceTrackerCustomizer() {
- public synchronized void removedService(final ServiceReference reference, final Object service) {
+ public void removedService(final ServiceReference reference, final Object service) {
unregister(reference, service);
btx.ungetService(reference);
}
- public synchronized void modifiedService(final ServiceReference reference, final Object service) {
+ public void modifiedService(final ServiceReference reference, final Object service) {
unregister(reference, service);
register(reference, service);
}
- public synchronized Object addingService(final ServiceReference reference) {
+ public Object addingService(final ServiceReference reference) {
final Object obj = btx.getService(reference);
if ( obj != null ) {
register(reference, obj);