Core: Fix NPE. The future field is set from a different thread.

Closes elastic#10630
mute · Apr 17, 2015 · cb45355 · cb45355
1 parent 4b906ab
commit cb45355
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java b/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
@@ -516,7 +516,7 @@ public void run() {
     class NotifyTimeout implements Runnable {
         final TimeoutClusterStateListener listener;
         final TimeValue timeout;
-        ScheduledFuture future;
+        volatile ScheduledFuture future;
 
         NotifyTimeout(TimeoutClusterStateListener listener, TimeValue timeout) {
             this.listener = listener;
@@ -529,7 +529,7 @@ public void cancel() {
 
         @Override
         public void run() {
-            if (future.isCancelled()) {
+            if (future != null && future.isCancelled()) {
                 return;
             }
             if (lifecycle.stoppedOrClosed()) {