From 832887152f0cfbb0ff1d9ca3d3c5624818ecc87d Mon Sep 17 00:00:00 2001
From: Andrew Stitcher <astitcher@apache.org>
Date: Tue, 26 Jan 2010 20:45:03 +0000
Subject: Fix memory error in previous SocketAddress refactoring

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@903407 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/sys/rdma/RdmaIO.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'cpp/src/qpid/sys/rdma/RdmaIO.cpp')

diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.cpp b/cpp/src/qpid/sys/rdma/RdmaIO.cpp
index 8d06fccba1..588d459b65 100644
--- a/cpp/src/qpid/sys/rdma/RdmaIO.cpp
+++ b/cpp/src/qpid/sys/rdma/RdmaIO.cpp
@@ -452,8 +452,8 @@ namespace Rdma {
         handle.stopWatch();
     }
 
-    void ConnectionManager::start(Poller::shared_ptr poller) {
-        startConnection(ci);
+    void ConnectionManager::start(Poller::shared_ptr poller, const qpid::sys::SocketAddress& addr) {
+        startConnection(ci, addr);
         handle.startWatch(poller);
     }
 
@@ -462,7 +462,6 @@ namespace Rdma {
     }
 
     Listener::Listener(
-        const SocketAddress& src,
         const ConnectionParams& cp,
         EstablishedCallback ec,
         ErrorCallback errc,
@@ -470,15 +469,14 @@ namespace Rdma {
         ConnectionRequestCallback crc
     ) :
         ConnectionManager(errc, dc),
-        src_addr(src),
         checkConnectionParams(cp),
         connectionRequestCallback(crc),
         establishedCallback(ec)
     {
     }
 
-    void Listener::startConnection(Connection::intrusive_ptr ci) {
-        ci->bind(src_addr);
+    void Listener::startConnection(Connection::intrusive_ptr ci, const qpid::sys::SocketAddress& addr) {
+        ci->bind(addr);
         ci->listen();
     }
 
@@ -542,7 +540,6 @@ namespace Rdma {
     }
 
     Connector::Connector(
-        const SocketAddress& dst,
         const ConnectionParams& cp,
         ConnectedCallback cc,
         ErrorCallback errc,
@@ -550,15 +547,14 @@ namespace Rdma {
         RejectedCallback rc
     ) :
         ConnectionManager(errc, dc),
-        dst_addr(dst),
         connectionParams(cp),
         rejectedCallback(rc),
         connectedCallback(cc)
     {
     }
 
-    void Connector::startConnection(Connection::intrusive_ptr ci) {
-        ci->resolve_addr(dst_addr);
+    void Connector::startConnection(Connection::intrusive_ptr ci, const qpid::sys::SocketAddress& addr) {
+        ci->resolve_addr(addr);
     }
 
     void Connector::connectionEvent(Connection::intrusive_ptr ci) {
-- 
cgit v1.2.1