1 files changed, 130 insertions, 72 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
index 6abef6fd6b..27345f0a88 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
@@ -410,7 +410,10 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
         ConcurrentHashMap<UUID, QMFObject> map = _managedObjectsById.get(qmfclass);
         if(map != null)
         {
-            return map.get(id);
+
+            UUID key = new UUID(id.getMostSignificantBits() & (0xFFFl << 48), id.getLeastSignificantBits());
+            return map.get(key);
+
         }
         else
         {
@@ -604,6 +607,11 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
         {
             return _obj.getCreateTime();
         }
+
+        public String toString()
+        {
+            return _obj.toString();
+        }
     }
 
     private class BrokerDelegate implements BrokerSchema.BrokerDelegate
@@ -762,6 +770,11 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
         {
             return _obj.getCreateTime();
         }
+
+        public String toString()
+        {
+            return _obj.toString();
+        }
     }
 
     private class VhostDelegate implements BrokerSchema.VhostDelegate
@@ -797,6 +810,11 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
         {
             return _obj.getCreateTime();
         }
+
+        public String toString()
+        {
+            return _obj.toString();
+        }
     }
 
     private class ExchangeDelegate implements BrokerSchema.ExchangeDelegate
@@ -923,6 +941,11 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
         {
             return _obj.getCreateTime();
         }
+
+        public String toString()
+        {
+            return _obj.toString();
+        }
     }
 
     private class QueueDelegate implements BrokerSchema.QueueDelegate
@@ -1163,6 +1186,11 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
         {
             return _obj.getCreateTime();
         }
+
+        public String toString()
+        {
+            return _obj.toString();
+        }
     }
 
     private class BindingDelegate implements BrokerSchema.BindingDelegate
@@ -1214,6 +1242,11 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
         {
             return _obj.getCreateTime();
         }
+
+        public String toString()
+        {
+            return _obj.toString();
+        }
     }
 
     private class ConnectionDelegate implements BrokerSchema.ConnectionDelegate
@@ -1352,6 +1385,12 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             // TODO
             return 0;
         }
+
+
+        public String toString()
+        {
+            return _obj.toString();
+        }
     }
 
     private class SessionDelegate implements BrokerSchema.SessionDelegate
@@ -1476,6 +1515,11 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
         {
             return _obj.getCreateTime();
         }
+
+        public String toString()
+        {
+            return _obj.toString();
+        }
     }
 
     private class SubscriptionDelegate implements BrokerSchema.SubscriptionDelegate
@@ -1542,93 +1586,103 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
         {
             return _obj.getCreateTime();
         }
-    }
 
-        private class BridgeDelegate implements BrokerSchema.BridgeDelegate
+        public String toString()
         {
-            private final BridgeConfig _obj;
+            return _obj.toString();
+        }
+    }
 
-            private BridgeDelegate(final BridgeConfig obj)
-            {
-                _obj = obj;
-            }
+    private class BridgeDelegate implements BrokerSchema.BridgeDelegate
+    {
+        private final BridgeConfig _obj;
 
-            public BrokerSchema.LinkObject getLinkRef()
-            {
-                return (BrokerSchema.LinkObject) adapt(_obj.getLink());
-            }
+        private BridgeDelegate(final BridgeConfig obj)
+        {
+            _obj = obj;
+        }
 
-            public Integer getChannelId()
-            {
-                return _obj.getChannelId();
-            }
+        public BrokerSchema.LinkObject getLinkRef()
+        {
+            return (BrokerSchema.LinkObject) adapt(_obj.getLink());
+        }
 
-            public Boolean getDurable()
-            {
-                return _obj.isDurable();
-            }
+        public Integer getChannelId()
+        {
+            return _obj.getChannelId();
+        }
 
-            public String getSrc()
-            {
-                return _obj.getSource();
-            }
+        public Boolean getDurable()
+        {
+            return _obj.isDurable();
+        }
 
-            public String getDest()
-            {
-                return _obj.getDestination();
-            }
+        public String getSrc()
+        {
+            return _obj.getSource();
+        }
 
-            public String getKey()
-            {
-                return _obj.getKey();
-            }
+        public String getDest()
+        {
+            return _obj.getDestination();
+        }
 
-            public Boolean getSrcIsQueue()
-            {
-                return _obj.isQueueBridge();
-            }
+        public String getKey()
+        {
+            return _obj.getKey();
+        }
 
-            public Boolean getSrcIsLocal()
-            {
-                return _obj.isLocalSource();
-            }
+        public Boolean getSrcIsQueue()
+        {
+            return _obj.isQueueBridge();
+        }
 
-            public String getTag()
-            {
-                return _obj.getTag();
-            }
+        public Boolean getSrcIsLocal()
+        {
+            return _obj.isLocalSource();
+        }
 
-            public String getExcludes()
-            {
-                return _obj.getExcludes();
-            }
+        public String getTag()
+        {
+            return _obj.getTag();
+        }
 
-            public Boolean getDynamic()
-            {
-                return _obj.isDynamic();
-            }
+        public String getExcludes()
+        {
+            return _obj.getExcludes();
+        }
 
-            public Integer getSync()
-            {
-                return _obj.getAckBatching();
-            }
+        public Boolean getDynamic()
+        {
+            return _obj.isDynamic();
+        }
 
-            public BrokerSchema.BridgeClass.CloseMethodResponseCommand close(final BrokerSchema.BridgeClass.CloseMethodResponseCommandFactory factory)
-            {
-                return null;
-            }
+        public Integer getSync()
+        {
+            return _obj.getAckBatching();
+        }
 
-            public UUID getId()
-            {
-                return _obj.getId();
-            }
+        public BrokerSchema.BridgeClass.CloseMethodResponseCommand close(final BrokerSchema.BridgeClass.CloseMethodResponseCommandFactory factory)
+        {
+            return null;
+        }
 
-            public long getCreateTime()
-            {
-                return _obj.getCreateTime();
-            }
+        public UUID getId()
+        {
+            return _obj.getId();
         }
 
+        public long getCreateTime()
+        {
+            return _obj.getCreateTime();
+        }
+        
+        public String toString()
+        {
+            return _obj.toString();
+        }
+    }
+
     private class LinkDelegate implements BrokerSchema.LinkDelegate
     {
         private final LinkConfig _obj;
@@ -1665,14 +1719,12 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
 
         public String getState()
         {
-            // TODO
-            return "";
+            return _obj.getState();
         }
 
         public String getLastError()
         {
-            // TODO
-            return "";
+            return _obj.getLastError();
         }
 
         public BrokerSchema.LinkClass.CloseMethodResponseCommand close(final BrokerSchema.LinkClass.CloseMethodResponseCommandFactory factory)
@@ -1706,6 +1758,12 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
         {
             return _obj.getCreateTime();
         }
+
+        @Override
+        public String toString()
+        {
+            return _obj.toString();
+        }
     }
 
 }