QPID-6099: [Java Broker] Prevent exceptions whose message exceeds 255 characters causing unexpected Broker shutdown.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1624998 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 2 deletions

diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
index 81ce3678ad..a59f173d2f 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
@@ -1353,7 +1353,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
 
 
                 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 implements ServerProtocolEngine, AMQProtocolSessi
         ChannelCloseBody responseBody =
                 methodRegistry.createChannelCloseBody(
                         cause.getCode(),
-                        new AMQShortString(message),
+                        AMQShortString.validValueOf(message),
                         0,0);
 
         writeFrame(responseBody.generateFrame(channelId));