Update from trunk r1375509 through r1450773asyncstore

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 25 insertions, 1 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/model/Transport.java b/java/broker/src/main/java/org/apache/qpid/server/model/Transport.java
index 03cd46be01..ae6e5ac43a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/model/Transport.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/model/Transport.java
@@ -20,8 +20,32 @@
  */
 package org.apache.qpid.server.model;
 
+import java.util.EnumSet;
+
 public enum Transport
 {
     TCP,
-    SSL
+    SSL;
+
+    public static Transport valueOfObject(Object transportObject)
+    {
+        Transport transport;
+        if (transportObject instanceof Transport)
+        {
+            transport = (Transport) transportObject;
+        }
+        else
+        {
+            try
+            {
+                transport = Transport.valueOf(String.valueOf(transportObject));
+            }
+            catch (Exception e)
+            {
+                throw new IllegalArgumentException("Can't convert '" + transportObject
+                        + "' to one of the supported transports: " + EnumSet.allOf(Transport.class), e);
+            }
+        }
+        return transport;
+    }
 }