Author: gsim
Date: Fri Feb 16 05:43:01 2007
New Revision: 508391
URL: http://svn.apache.org/viewvc?view=rev&rev=508391
Log:
A few hacks and fixes to get the python tests running again.
Modified:
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQReference.java
Modified:
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?view=diff&rev=508391&r1=508390&r2=508391
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
Fri Feb 16 05:43:01 2007
@@ -468,6 +468,7 @@
_session.getProtocolMajorVersion(), // AMQP major version
_session.getProtocolMinorVersion(), // AMQP minor version
refId);
+ _session.writeRequest(_channelId, closeBody, listener);
}
// protected void route(AMQMessage msg) throws AMQException
Modified:
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java?view=diff&rev=508391&r1=508390&r2=508391
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
Fri Feb 16 05:43:01 2007
@@ -599,6 +599,7 @@
task.doTask(this);
}
}
+ _minaProtocolSession.close();
}
/**
Modified:
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java?view=diff&rev=508391&r1=508390&r2=508391
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
Fri Feb 16 05:43:01 2007
@@ -164,7 +164,8 @@
{
_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();
}
}
Modified:
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java?view=diff&rev=508391&r1=508390&r2=508391
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
Fri Feb 16 05:43:01 2007
@@ -96,7 +96,7 @@
public ManagedObject getParentObject()
{
- return _session.getVirtualHost().getManagedObject();
+ return _session.getVirtualHost() == null ? null :
_session.getVirtualHost().getManagedObject();
}
public Long getWrittenBytes()
Modified:
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java?view=diff&rev=508391&r1=508390&r2=508391
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
Fri Feb 16 05:43:01 2007
@@ -419,6 +419,7 @@
public void setRedelivered(boolean redelivered)
{
+ _transferBody.redelivered = redelivered;
_redelivered = redelivered;
}
Modified:
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQReference.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQReference.java?view=diff&rev=508391&r1=508390&r2=508391
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQReference.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQReference.java
Fri Feb 16 05:43:01 2007
@@ -37,8 +37,8 @@
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)
{
