summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/client
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2009-05-12 19:50:45 +0000
committerAndrew Stitcher <astitcher@apache.org>2009-05-12 19:50:45 +0000
commit8ad39ce15e81423e635c4e4425fc71674e878ce5 (patch)
treea10df9f0a74ff1db1b7573c0b06a3d07cca35d77 /cpp/src/qpid/client
parentf215e6224b30b0ae10151b6d0cd063bdeb812b30 (diff)
downloadqpid-python-8ad39ce15e81423e635c4e4425fc71674e878ce5.tar.gz
QPID-1852 Removed thread unsafe code in Logger
Fixed some potentially iffy code in Connector.h if a derived Connector doesn't have activateSecurityLayer() git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@774051 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/client')
-rw-r--r--cpp/src/qpid/client/Connector.cpp4
-rw-r--r--cpp/src/qpid/client/Connector.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/qpid/client/Connector.cpp b/cpp/src/qpid/client/Connector.cpp
index 8cca36c571..3d7fdc089b 100644
--- a/cpp/src/qpid/client/Connector.cpp
+++ b/cpp/src/qpid/client/Connector.cpp
@@ -77,6 +77,10 @@ void Connector::registerFactory(const std::string& proto, Factory* connectorFact
theProtocolRegistry()[proto] = connectorFactory;
}
+void Connector::activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer>)
+{
+}
+
class TCPConnector : public Connector, public sys::Codec, private sys::Runnable
{
typedef std::deque<framing::AMQFrame> Frames;
diff --git a/cpp/src/qpid/client/Connector.h b/cpp/src/qpid/client/Connector.h
index 2966166d28..78ddaa33cd 100644
--- a/cpp/src/qpid/client/Connector.h
+++ b/cpp/src/qpid/client/Connector.h
@@ -72,7 +72,7 @@ class Connector : public framing::OutputHandler
virtual framing::OutputHandler* getOutputHandler() = 0;
virtual const std::string& getIdentifier() const = 0;
- virtual void activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer>) {}
+ virtual void activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer>);
};