Fix for race conditions in cluster join.

 - ConnectionDecoder: separated from Connection. 
 - cluster/PollableQueue: stop processing frames if PollableQueue is stopped.
 - move state checks in event-queue handler to frame-queue handler.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@740459 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 49 insertions, 0 deletions

diff --git a/cpp/src/qpid/cluster/ConnectionDecoder.cpp b/cpp/src/qpid/cluster/ConnectionDecoder.cpp
new file mode 100644
index 0000000000..1500b6a743
--- /dev/null
+++ b/cpp/src/qpid/cluster/ConnectionDecoder.cpp
@@ -0,0 +1,49 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "ConnectionDecoder.h"
+#include "EventFrame.h"
+
+namespace qpid {
+namespace cluster {
+
+using namespace framing;
+
+ConnectionDecoder::ConnectionDecoder(const Handler& h) : handler(h), readCredit(0) {}
+
+void ConnectionDecoder::decode(const EventHeader& eh, const void* data) {
+    assert(eh.getType() == DATA); // Only handle connection data events.
+    const char* cp = static_cast<const char*>(data);
+    Buffer buf(const_cast<char*>(cp), eh.getSize());
+    // Set read credit on the last frame in the event.
+    ++readCredit;               // One credit per event = connection read buffer.
+    if (decoder.decode(buf)) { // Decoded a frame
+        AMQFrame frame(decoder.frame);
+        while (decoder.decode(buf)) {
+            handler(EventFrame(eh, frame));
+            frame = decoder.frame;
+        }
+        handler(EventFrame(eh, frame, readCredit));
+        readCredit = 0;         // Reset credit for next event.
+    }
+}
+
+}} // namespace qpid::cluster