You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/09/15 13:08:28 UTC

svn commit: r1624998 - /qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java

Author: kwall
Date: Mon Sep 15 11:08:27 2014
New Revision: 1624998

URL: http://svn.apache.org/r1624998
Log:
QPID-6099: [Java Broker] Prevent exceptions whose message exceeds 255 characters causing unexpected Broker shutdown.

Modified:
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java?rev=1624998&r1=1624997&r2=1624998&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java Mon Sep 15 11:08:27 2014
@@ -1353,7 +1353,7 @@ public class AMQProtocolEngine implement
 
 
                 MethodRegistry methodRegistry = MethodRegistry.getMethodRegistry(getProtocolVersion());
-                ConnectionCloseBody closeBody = methodRegistry.createConnectionCloseBody(200,new AMQShortString(throwable.getMessage()),0,0);
+                ConnectionCloseBody closeBody = methodRegistry.createConnectionCloseBody(200, AMQShortString.validValueOf(throwable.getMessage()),0,0);
 
                 writeFrame(closeBody.generateFrame(0));
 
@@ -1469,7 +1469,7 @@ public class AMQProtocolEngine implement
         ChannelCloseBody responseBody =
                 methodRegistry.createChannelCloseBody(
                         cause.getCode(),
-                        new AMQShortString(message),
+                        AMQShortString.validValueOf(message),
                         0,0);
 
         writeFrame(responseBody.generateFrame(channelId));



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org