From 693c2a2f4fed5545b14250b3a841f1b687809c57 Mon Sep 17 00:00:00 2001
From: Andrew Stitcher <astitcher@apache.org>
Date: Wed, 8 Sep 2010 16:49:33 +0000
Subject: Reordered members of RdmaIOHandler to ensure correct destruction
 order

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@995140 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/sys/RdmaIOPlugin.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'cpp')

diff --git a/cpp/src/qpid/sys/RdmaIOPlugin.cpp b/cpp/src/qpid/sys/RdmaIOPlugin.cpp
index 09c9770a5b..40967ca7c4 100644
--- a/cpp/src/qpid/sys/RdmaIOPlugin.cpp
+++ b/cpp/src/qpid/sys/RdmaIOPlugin.cpp
@@ -44,9 +44,7 @@ namespace qpid {
 namespace sys {
 
 class RdmaIOHandler : public OutputControl {
-    Rdma::Connection::intrusive_ptr connection;
     std::string identifier;
-    Rdma::AsynchIO* aio;
     ConnectionCodec::Factory* factory;
     ConnectionCodec* codec;
     bool readError;
@@ -54,6 +52,9 @@ class RdmaIOHandler : public OutputControl {
     sys::Mutex pollingLock;
     bool polling;
 
+    Rdma::AsynchIO* aio;
+    Rdma::Connection::intrusive_ptr connection;
+
     void write(const framing::ProtocolInitiation&);
 
   public:
@@ -82,12 +83,12 @@ class RdmaIOHandler : public OutputControl {
 };
 
 RdmaIOHandler::RdmaIOHandler(Rdma::Connection::intrusive_ptr c, qpid::sys::ConnectionCodec::Factory* f) :
-    connection(c),
     identifier(c->getPeerName()),
     factory(f),
     codec(0),
     readError(false),
-    polling(false)
+    polling(false),
+    connection(c)
 {
 }
 
-- 
cgit v1.2.1