From 0cf4fa0b2d77b8e0acc8f0e1ac904c84f6321f64 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Mon, 15 Sep 2014 11:08:27 +0000 Subject: 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@1624998 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java index 81ce3678ad..a59f173d2f 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java +++ b/qpid/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)); -- cgit v1.2.1