From f6dda35aa459b6b128c435248ba0e1f28356728b Mon Sep 17 00:00:00 2001
From: wodencafe <wodencafe@gmail.com>
Date: Wed, 28 Jan 2015 09:42:18 -0600
Subject: Fixed UI.getPushConfiguration().getTransport() always returning null
 (#16499)

Change-Id: I31a923faf5ae369ffc2160cdeb12584ca0babc9d
---
 server/src/com/vaadin/ui/PushConfiguration.java    |  2 +-
 .../vaadin/ui/PushConfigurationTransportTest.java  | 46 ++++++++++++++++++++++
 shared/src/com/vaadin/shared/ui/ui/Transport.java  |  8 ++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 server/tests/src/com/vaadin/ui/PushConfigurationTransportTest.java

diff --git a/server/src/com/vaadin/ui/PushConfiguration.java b/server/src/com/vaadin/ui/PushConfiguration.java
index 84f59d0313..90ad28542c 100644
--- a/server/src/com/vaadin/ui/PushConfiguration.java
+++ b/server/src/com/vaadin/ui/PushConfiguration.java
@@ -208,7 +208,7 @@ class PushConfigurationImpl implements PushConfiguration {
     public Transport getTransport() {
         try {
             return Transport
-                    .valueOf(getParameter(PushConfigurationState.TRANSPORT_PARAM));
+                    .getByIdentifier(getParameter(PushConfigurationState.TRANSPORT_PARAM));
         } catch (IllegalArgumentException e) {
             return null;
         }
diff --git a/server/tests/src/com/vaadin/ui/PushConfigurationTransportTest.java b/server/tests/src/com/vaadin/ui/PushConfigurationTransportTest.java
new file mode 100644
index 0000000000..305b2e06cd
--- /dev/null
+++ b/server/tests/src/com/vaadin/ui/PushConfigurationTransportTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.ui;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.ui.Transport;
+
+/**
+ * @author Vaadin Ltd
+ */
+public class PushConfigurationTransportTest {
+    @Test
+    public void testTransportModes() throws Exception {
+        UI ui = new UI() {
+
+            @Override
+            protected void init(VaadinRequest request) {
+                // TODO Auto-generated method stub
+
+            }
+
+        };
+        for (Transport transport : Transport.values()) {
+            ui.getPushConfiguration().setTransport(transport);
+            Assert.assertEquals(ui.getPushConfiguration().getTransport(),
+                    transport);
+        }
+
+    }
+}
diff --git a/shared/src/com/vaadin/shared/ui/ui/Transport.java b/shared/src/com/vaadin/shared/ui/ui/Transport.java
index 6eafba185e..39174caddf 100644
--- a/shared/src/com/vaadin/shared/ui/ui/Transport.java
+++ b/shared/src/com/vaadin/shared/ui/ui/Transport.java
@@ -46,4 +46,12 @@ public enum Transport {
         return identifier;
     }
 
+    public static Transport getByIdentifier(String identifier) {
+        for (Transport t : values()) {
+            if (t.getIdentifier().equals(identifier)) {
+                return t;
+            }
+        }
+        return null;
+    }
 }
-- 
cgit v1.2.3