Re-use the single empty Disposable instance everywhere. (ReactiveX#4078)

JakeWharton · akarnokd · commit f06aaeba79cc · 2016-06-22T22:28:06.000+02:00
diff --git a/src/main/java/io/reactivex/disposables/Disposables.java b/src/main/java/io/reactivex/disposables/Disposables.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.disposables;
 
+import io.reactivex.internal.disposables.EmptyDisposable;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -55,13 +56,8 @@ public void dispose() {
         };
     }
 
-    static final Disposable EMPTY = new Disposable() {
-        @Override
-        public void dispose() { }
-    };
-    
     public static Disposable empty() {
-        return EMPTY;
+        return EmptyDisposable.INSTANCE;
     }
 
     public static Disposable disposed() {
diff --git a/src/main/java/io/reactivex/internal/disposables/NbpFullArbiter.java b/src/main/java/io/reactivex/internal/disposables/NbpFullArbiter.java
@@ -32,12 +32,7 @@ public final class NbpFullArbiter<T> extends FullArbiterPad1 implements Disposab
     final SpscLinkedArrayQueue<Object> queue;
 
     volatile Disposable s;
-    static final Disposable INITIAL = new Disposable() {
-        @Override
-        public void dispose() { }
-    };
-    
-    
+
     Disposable resource;
 
     volatile boolean cancelled;
@@ -46,7 +41,7 @@ public NbpFullArbiter(Observer<? super T> actual, Disposable resource, int capac
         this.actual = actual;
         this.resource = resource;
         this.queue = new SpscLinkedArrayQueue<Object>(capacity);
-        this.s = INITIAL;
+        this.s = EmptyDisposable.INSTANCE;
     }
 
     @Override
