Reorder pending queue clean checks

Author: jasontedor

core/src/main/java/org/elasticsearch/discovery/zen/publish/PendingClusterStatesQueue.java

@@ -164,21 +164,18 @@ public synchronized void markAsProcessed(ClusterState state) {
                             currentMaster
                     );
                 }
+            } else if (pendingState.stateUUID().equals(state.stateUUID())) {
+                assert pendingContext.committed() : "processed cluster state is not committed " + state;
+                contextsToRemove.add(pendingContext);
+                pendingContext.listener.onNewClusterStateProcessed();
             } else if (state.version() >= pendingState.version()) {
-                assert state.supersedes(pendingState) || (
-                        state.nodes().getMasterNodeId() != null &&
-                                state.nodes().getMasterNodeId().equals(pendingState.nodes().getMasterNodeId()));
                 logger.trace("processing pending state uuid[{}]/v[{}] together with state uuid[{}]/v[{}]",
                         pendingState.stateUUID(), pendingState.version(), state.stateUUID(), state.version()
                 );
                 contextsToRemove.add(pendingContext);
                 if (pendingContext.committed()) {
                     pendingContext.listener.onNewClusterStateProcessed();
                 }
-            } else if (pendingState.stateUUID().equals(state.stateUUID())) {
-                assert pendingContext.committed() : "processed cluster state is not committed " + state;
-                contextsToRemove.add(pendingContext);
-                pendingContext.listener.onNewClusterStateProcessed();
             }
         }
         // now ack the processed state