From d0a73775a14466283f37b0dce90a178d86b88ad8 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Mon, 24 Nov 2008 14:16:30 +0000 Subject: QPID-1251 : Applied patch from JIRA (With correct code style). Augemented ConnectionTest to correctly test for the special os.name = windows case. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@720200 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/transport/Connection.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'java/common/src/main') diff --git a/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/java/common/src/main/java/org/apache/qpid/transport/Connection.java index cf9b9145a9..56cbf5ee13 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/Connection.java +++ b/java/common/src/main/java/org/apache/qpid/transport/Connection.java @@ -181,7 +181,17 @@ public class Connection extends ConnectionInvoker { ConnectionException t = error; error = null; - close(); + try + { + close(); + } + catch (ConnectionException ce) + { + if (!(t instanceof ProtocolVersionException)) + { + throw ce; + } + } t.rethrow(); } -- cgit v1.2.1