From a39f258a418eb3d6156bc3a9f4a1f8e709cf774d Mon Sep 17 00:00:00 2001
From: Robert Greig <rgreig@apache.org>
Date: Wed, 24 Jan 2007 17:19:19 +0000
Subject: QPID-50 : Patch supplied by Rob Godfrey - Virtual Host implementation

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@499490 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/distribution/src/main/assembly/broker-bin.xml    | 12 ++++++------
 .../qpid/server/handler/ConnectionOpenMethodHandler.java     | 11 ++++++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'java/broker')

diff --git a/java/broker/distribution/src/main/assembly/broker-bin.xml b/java/broker/distribution/src/main/assembly/broker-bin.xml
index e64685fc79..4a7343660d 100644
--- a/java/broker/distribution/src/main/assembly/broker-bin.xml
+++ b/java/broker/distribution/src/main/assembly/broker-bin.xml
@@ -105,37 +105,37 @@
       <source>../../common/bin/qpid-run</source>
       <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
       <destName>qpid-run</destName>
-      <fileMode>493</fileMode>
+      <fileMode>473</fileMode>
     </file>
     <file>
       <source>../bin/qpid-server</source>
       <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
       <destName>qpid-server</destName>
-      <fileMode>493</fileMode>
+      <fileMode>473</fileMode>
     </file>
     <file>
       <source>../bin/qpid-server.bat</source>
       <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
       <destName>qpid-server.bat</destName>
-      <fileMode>493</fileMode>
+      <fileMode>473</fileMode>
     </file>
     <file>
       <source>../bin/run.bat</source>
       <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
       <destName>run.bat</destName>
-      <fileMode>493</fileMode>
+      <fileMode>473</fileMode>
     </file>
     <file>
       <source>../bin/run.sh</source>
       <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
       <destName>run.sh</destName>
-      <fileMode>493</fileMode>
+      <fileMode>473</fileMode>
     </file>
     <file>
       <source>../bin/runAll</source>
       <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
       <destName>runAll</destName>
-      <fileMode>493</fileMode>
+      <fileMode>473</fileMode>
     </file>
   </files>
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
index 88717c446b..c3b1ba3b5b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
@@ -58,7 +58,16 @@ public class ConnectionOpenMethodHandler implements StateAwareMethodListener<Con
         AMQProtocolSession session = stateManager.getProtocolSession();
         ConnectionOpenBody body = evt.getMethod();
 
-        String virtualHostName = String.valueOf(body.virtualHost);
+        //ignore leading '/'
+        String virtualHostName;
+        if((body.virtualHost != null) && body.virtualHost.charAt(0) == '/')
+        {
+            virtualHostName = new StringBuilder(body.virtualHost.subSequence(1,body.virtualHost.length())).toString();
+        }
+        else
+        {
+            virtualHostName = String.valueOf(body.virtualHost);
+        }
 
         VirtualHost virtualHost = stateManager.getVirtualHostRegistry().getVirtualHost(virtualHostName);
 
-- 
cgit v1.2.1