A few hacks and fixes to get the python tests running again.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@508391 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 8 insertions, 4 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index 4d98b4a14d..c5d0220989 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -468,6 +468,7 @@ public class AMQChannel
             _session.getProtocolMajorVersion(), // AMQP major version
             _session.getProtocolMinorVersion(), // AMQP minor version
             refId);
+        _session.writeRequest(_channelId, closeBody, listener);
     }
 
 //     protected void route(AMQMessage msg) throws AMQException
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
index bf8d541a44..2c65fc02da 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
@@ -599,6 +599,7 @@ public class AMQMinaProtocolSession implements AMQProtocolSession,
                 task.doTask(this);
             }
         }
+        _minaProtocolSession.close();
     }
 
     /**
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
index 26b7bc6992..073d81493e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
@@ -164,7 +164,8 @@ public class AMQPFastProtocolHandler extends IoHandlerAdapter implements Protoco
         {
             _logger.error("Exception caught in" + session + ", closing session explictly: " + throwable, throwable);
             // TODO: Closing with code 200 ("reply-sucess") ??? This cannot be right!
-            session.closeSessionRequest(200, new AMQShortString(throwable.getMessage()));
+            //session.closeSessionRequest(200, new AMQShortString(throwable.getMessage()));
+            session.closeSession();
         }
     }
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
index 8c6929ab81..b93ab4c268 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
@@ -96,7 +96,7 @@ public class AMQProtocolSessionMBean extends AMQManagedObject implements Managed
 
     public ManagedObject getParentObject()
     {
-        return _session.getVirtualHost().getManagedObject();
+        return _session.getVirtualHost() == null ? null : _session.getVirtualHost().getManagedObject();
     }
 
     public Long getWrittenBytes()
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
index a271b0b6ed..d433dd6bea 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
@@ -419,6 +419,7 @@ public class AMQMessage
 
     public void setRedelivered(boolean redelivered)
     {
+        _transferBody.redelivered = redelivered;
         _redelivered = redelivered;
     }
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQReference.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQReference.java
index a852d0af64..515f991cf7 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQReference.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQReference.java
@@ -37,8 +37,8 @@ import java.util.List;
 public class AMQReference
 {
     private byte[] ref;
-    private static List<AMQMessage> messageList = new LinkedList();
-    private static List<ByteBuffer> contentList = new LinkedList();
+    private List<AMQMessage> messageList = new LinkedList();
+    private List<ByteBuffer> contentList = new LinkedList();
     
     public AMQReference(byte[] ref)
     {