Merge pull request #1012 from akarnokd/SerializedObserverFix2

Removed window between the two synchronized blocks.

Author: benjchristensen

Diff for: rxjava-core/src/main/java/rx/observers/SerializedObserver.java

@@ -128,6 +128,7 @@ public void onNext(T t) {
         }
 
         // we only get here if we won the right to emit, otherwise we returned in the if(emitting) block above
+        boolean skipFinal = false;
         try {
             int iter = MAX_DRAIN_ITERATION;
             do {
@@ -141,27 +142,32 @@ public void onNext(T t) {
                     synchronized (this) {
                         list = queue;
                         queue = null;
-                    }
-                    if (list == null) {
-                        break;
+                        if (list == null) {
+                            emitting = false;
+                            skipFinal = true;
+                            return;
+                        }
                     }
                 }
             } while (iter > 0);
         } finally {
-            synchronized (this) {
-                if (terminated) {
-                    list = queue;
-                    queue = null;
-                } else {
-                    emitting = false;
-                    list = null;
+            if (!skipFinal) {
+                synchronized (this) {
+                    if (terminated) {
+                        list = queue;
+                        queue = null;
+                    } else {
+                        emitting = false;
+                        list = null;
+                    }
                 }
             }
-            // this will only drain if terminated (done here outside of synchronized block)
-            drainQueue(list);
         }
+        
+        // this will only drain if terminated (done here outside of synchronized block)
+        drainQueue(list);
     }
-
+    
     void drainQueue(FastList list) {
         if (list == null || list.size == 0) {
             return;