diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2008-11-24 14:16:30 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2008-11-24 14:16:30 +0000 |
| commit | ac6e526370a8e860123a97fced2019ebb28146ce (patch) | |
| tree | b5019711fc8a98b2be3ec2ac7d16b4d99a148642 /qpid/java/common/src/main | |
| parent | f5bc6d047f2ea17048704c6e353078e9d2b27978 (diff) | |
| download | qpid-python-ac6e526370a8e860123a97fced2019ebb28146ce.tar.gz | |
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@720200 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src/main')
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java index cf9b9145a9..56cbf5ee13 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java +++ b/qpid/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(); } |