From 729e9ce65125154cfdd2877abc8f7a901ad7caa2 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 3 Feb 2009 21:28:14 +0000 Subject: 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 --- cpp/src/qpid/cluster/Decoder.cpp | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 cpp/src/qpid/cluster/Decoder.cpp (limited to 'cpp/src/qpid/cluster/Decoder.cpp') diff --git a/cpp/src/qpid/cluster/Decoder.cpp b/cpp/src/qpid/cluster/Decoder.cpp new file mode 100644 index 0000000000..b2ab7c8d0f --- /dev/null +++ b/cpp/src/qpid/cluster/Decoder.cpp @@ -0,0 +1,46 @@ +/* + * + * 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 "Decoder.h" +#include "Event.h" +#include "qpid/framing/Buffer.h" +#include "qpid/ptr_map.h" + +namespace qpid { +namespace cluster { + +using namespace framing; + +Decoder::Decoder(const Handler& h) : handler(h) {} + +void Decoder::decode(const EventHeader& eh, const void* data) { + ConnectionId id = eh.getConnectionId(); + std::pair ib = map.insert(id, new ConnectionDecoder(handler)); + ptr_map_ptr(ib.first)->decode(eh, data); +} + +void Decoder::erase(const ConnectionId& c) { + Map::iterator i = map.find(c); + if (i != map.end()) // FIXME aconway 2009-02-03: + map.erase(i); +} + +}} // namespace qpid::cluster -- cgit v1.2.1