diff options
Diffstat (limited to 'qpid/java')
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java index 69b4939070..cd31974e7f 100644 --- a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java +++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Connection.java @@ -179,7 +179,7 @@ public class Connection implements ExceptionHandler boolean ssl, int channelMax) throws ConnectionException { - this(ssl?"amqp":"amqps",address,port,username,password,maxFrameSize,container, + this(ssl?"amqps":"amqp",address,port,username,password,maxFrameSize,container, remoteHostname, getSslContext(ssl), null, diff --git a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java index 3e9dca683e..38f28667d6 100644 --- a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java +++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java @@ -225,8 +225,8 @@ public class FrameHandler implements ProtocolHandler // PARSE HERE try { - Object val = _typeHandler.parse(in); - + Object val = in.hasRemaining() ? _typeHandler.parse(in) : null; + if(in.hasRemaining()) { if(val instanceof Transfer) |