Merge pull request #3500 from dromato/1.x

Some code clean ups.

Author: abersnaze

src/main/java/rx/internal/operators/BlockingOperatorNext.java

@@ -79,11 +79,11 @@ public boolean hasNext() {
             }
             // Since an iterator should not be used in different thread,
             // so we do not need any synchronization.
-            if (hasNext == false) {
+            if (!hasNext) {
                 // the iterator has reached the end.
                 return false;
             }
-            if (isNextConsumed == false) {
+            if (!isNextConsumed) {
                 // next has not been used yet.
                 return true;
             }

src/main/java/rx/internal/operators/OnSubscribeRedo.java

@@ -195,7 +195,7 @@ public void call(final Subscriber<? super T> child) {
         final AtomicBoolean resumeBoundary = new AtomicBoolean(true);
 
         // incremented when requests are made, decremented when requests are fulfilled
-        final AtomicLong consumerCapacity = new AtomicLong(0l);
+        final AtomicLong consumerCapacity = new AtomicLong();
 
         final Scheduler.Worker worker = scheduler.createWorker();
         child.add(worker);

src/main/java/rx/internal/operators/OperatorBufferWithSize.java

@@ -156,7 +156,6 @@ public void request(long n) {
                         }
                         if (n == Long.MAX_VALUE) {
                             requestInfinite();
-                            return;
                         } else {
                             if (firstRequest) {
                                 firstRequest = false;

src/main/java/rx/internal/operators/OperatorConcat.java

@@ -229,5 +229,5 @@ public void setProducer(Producer producer) {
             arbiter.setProducer(producer);
         }
 
-    };
+    }
 }

src/main/java/rx/internal/operators/OperatorWindowWithSize.java

@@ -117,7 +117,6 @@ public void onNext(T t) {
                 noWindow = true;
                 if (child.isUnsubscribed()) {
                     unsubscribe();
-                    return;
                 }
             }
         }

src/main/java/rx/internal/operators/OperatorWithLatestFrom.java

@@ -60,7 +60,6 @@ public void onNext(T t) {
                         s.onNext(result);
                     } catch (Throwable e) {
                         Exceptions.throwOrReport(e, this);
-                        return;
                     }
                 }
             }

src/main/java/rx/internal/schedulers/EventLoopsScheduler.java

@@ -160,18 +160,16 @@ public Subscription schedule(Action0 action) {
             if (isUnsubscribed()) {
                 return Subscriptions.unsubscribed();
             }
-            ScheduledAction s = poolWorker.scheduleActual(action, 0, null, serial);
-            
-            return s;
+
+            return poolWorker.scheduleActual(action, 0, null, serial);
         }
         @Override
         public Subscription schedule(Action0 action, long delayTime, TimeUnit unit) {
             if (isUnsubscribed()) {
                 return Subscriptions.unsubscribed();
             }
-            ScheduledAction s = poolWorker.scheduleActual(action, delayTime, unit, timed);
-            
-            return s;
+
+            return poolWorker.scheduleActual(action, delayTime, unit, timed);
         }
     }
 

src/main/java/rx/internal/schedulers/GenericScheduledExecutorService.java

@@ -70,7 +70,6 @@ public void start() {
                     NewThreadWorker.registerExecutor((ScheduledThreadPoolExecutor)exec);
                 }
             }
-            return;
         } else {
             exec.shutdownNow();
         }

src/main/java/rx/internal/util/SubscriptionRandomList.java

@@ -108,7 +108,7 @@ public void clear() {
     }
 
     public void forEach(Action1<T> action) {
-        T[] ss=null;
+        T[] ss = null;
         synchronized (this) {
             if (unsubscribed || subscriptions == null) {
                 return;

src/main/java/rx/observables/AbstractOnSubscribe.java

@@ -597,10 +597,7 @@ protected boolean use() {
          */
         protected void free() {
             int i = inUse.get();
-            if (i <= 0) {
-                return;
-            } else
-            if (inUse.decrementAndGet() == 0) {
+            if (i > 0 && inUse.decrementAndGet() == 0) {
                 parent.onTerminated(state);
             }
         }