diff options
| author | Robert Greig <rgreig@apache.org> | 2007-01-24 17:19:19 +0000 |
|---|---|---|
| committer | Robert Greig <rgreig@apache.org> | 2007-01-24 17:19:19 +0000 |
| commit | e6c79fe6ee142cba80245456e3525bff40a9aada (patch) | |
| tree | c6a6e013ed8018adbf369275dfd1a979f3a2950d /qpid/java/client/src/main | |
| parent | accc7ef56797624356ba50f002c4844897bc9462 (diff) | |
| download | qpid-python-e6c79fe6ee142cba80245456e3525bff40a9aada.tar.gz | |
QPID-50 : Patch supplied by Rob Godfrey - Virtual Host implementation
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@499490 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src/main')
3 files changed, 16 insertions, 6 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java index c82afd3906..261efd4f3b 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java @@ -202,7 +202,7 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect _clientName = connectionURL.getClientName(); _username = connectionURL.getUsername(); _password = connectionURL.getPassword(); - _virtualHost = connectionURL.getVirtualHost(); + setVirtualHost(connectionURL.getVirtualHost()); _failoverPolicy = new FailoverPolicy(connectionURL); @@ -313,6 +313,15 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect _clientName = clientName; _username = username; _password = password; + setVirtualHost(virtualHost); + } + + private void setVirtualHost(String virtualHost) + { + if(virtualHost.startsWith("/")) + { + virtualHost = virtualHost.substring(1); + } _virtualHost = virtualHost; } diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java index b32a0ffdc4..c134c2093b 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java @@ -114,10 +114,6 @@ public class AMQConnectionURL implements ConnectionURL if (virtualHost != null && (!virtualHost.equals(""))) { - if(virtualHost.startsWith("/")) - { - virtualHost = virtualHost.substring(1); - } setVirtualHost(virtualHost); } else diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java index 3f4e0022ca..2adafb8be7 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java @@ -63,7 +63,12 @@ public class ConnectionTuneMethodHandler implements StateAwareMethodListener stateManager.changeState(AMQState.CONNECTION_NOT_OPENED); protocolSession.writeFrame(createTuneOkFrame(evt.getChannelId(), params)); - protocolSession.writeFrame(createConnectionOpenFrame(evt.getChannelId(), new AMQShortString(protocolSession.getAMQConnection().getVirtualHost()), null, true)); + + String host = protocolSession.getAMQConnection().getVirtualHost(); + AMQShortString virtualHost = new AMQShortString("/" + host); + + + protocolSession.writeFrame(createConnectionOpenFrame(evt.getChannelId(), virtualHost, null, true)); } protected AMQFrame createConnectionOpenFrame(int channel, AMQShortString path, AMQShortString capabilities, boolean insist) |