Merge pull request #3362 from artem-zinnatullin/fix-synchronization-on-non-final-field-in-BufferUntilSubscriber

akarnokd · akarnokd · commit c58a785eb2ec · 2015-09-29T09:00:20.000+02:00
Fix synchronization on non-final field in BufferUntilSubscriber
diff --git a/src/main/java/rx/internal/operators/BufferUntilSubscriber.java b/src/main/java/rx/internal/operators/BufferUntilSubscriber.java
@@ -70,7 +70,7 @@ boolean casObserverRef(Observer<? super T>  expected, Observer<? super T>  next)
             return OBSERVER_UPDATER.compareAndSet(this, expected, next);
         }
 
-        Object guard = new Object();
+        final Object guard = new Object();
         /* protected by guard */
         boolean emitting = false;
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ boolean casObserverRef(Observer<? super T> expected, Observer<? super T> next)`
`70`	`70`	`return OBSERVER_UPDATER.compareAndSet(this, expected, next);`
`71`	`71`	`}`
`72`	`72`
`73`		`- Object guard = new Object();`
	`73`	`+ final Object guard = new Object();`
`74`	`74`	`/* protected by guard */`
`75`	`75`	`boolean emitting = false;`
`76`	`76`