Author: mgoulish
Date: Thu Jan 5 14:56:52 2012
New Revision: 1227616
URL: http://svn.apache.org/viewvc?rev=1227616&view=rev
Log:
QPID-3438
Remove unnecessary changes to broker. The cluster code does not really need
to know that the cnx error was due to auth failure. Any failure before the cnx
has opened should cause the cnx to be removed from the 'local' map, or a cnx
leak
will occur.
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h
qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp?rev=1227616&r1=1227615&r2=1227616&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp Thu Jan 5 14:56:52 2012
@@ -100,8 +100,7 @@ Connection::Connection(ConnectionOutputH
errorListener(0),
objectId(objectId_),
shadow(shadow_),
- outboundTracker(*this),
- securityFailed(false)
+ outboundTracker(*this)
{
outboundTracker.wrap(out);
if (isLink)
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h?rev=1227616&r1=1227615&r2=1227616&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h Thu Jan 5 14:56:52 2012
@@ -207,13 +207,8 @@ class Connection : public sys::Connectio
void sent(const framing::AMQFrame& f);
- bool securityFailed;
-
public:
- bool securityFailure ( ) const { return securityFailed; }
- void securityFailure ( bool failed ) { securityFailed = failed; }
-
qmf::org::apache::qpid::broker::Connection* getMgmtObject() { return
mgmtObject; }
};
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp?rev=1227616&r1=1227615&r2=1227616&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp Thu Jan 5
14:56:52 2012
@@ -450,7 +450,6 @@ void CyrusAuthenticator::processAuthenti
client.secure(challenge_str);
} else {
- connection.securityFailure ( true );
std::string uid;
//save error detail before trying to retrieve username as error in
doing so will overwrite it
std::string errordetail = sasl_errdetail(sasl_conn);
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp?rev=1227616&r1=1227615&r2=1227616&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp Thu Jan 5 14:56:52 2012
@@ -742,9 +742,7 @@ void Connection::connectionError(const s
cluster.flagError(*this, ERROR_TYPE_CONNECTION, msg);
}
else
- if ( connection->securityFailure() ) {
cluster.eraseLocal(self);
- }
}
void Connection::addQueueListener(const std::string& q, uint32_t listener) {
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
