Author: mduerig
Date: Wed Feb 25 22:01:39 2015
New Revision: 1662314
URL: http://svn.apache.org/r1662314
Log:
OAK-2554: Make AbstractServiceTracker.stop() idempotent
Calling stop on a stopped service tracker has no effect now
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/AbstractServiceTracker.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/AbstractServiceTracker.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/AbstractServiceTracker.java?rev=1662314&r1=1662313&r2=1662314&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/AbstractServiceTracker.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/AbstractServiceTracker.java
Wed Feb 25 22:01:39 2015
@@ -71,10 +71,11 @@ public abstract class AbstractServiceTra
}
public synchronized void stop() {
- checkState(tracker != stopped);
- Tracker<T> t = tracker;
- tracker = stopped;
- t.stop();
+ if (tracker != stopped) {
+ Tracker<T> t = tracker;
+ tracker = stopped;
+ t.stop();
+ }
}
/**
