Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-12-04 17:40:22 +0000
committerJoakim Erdfelt2014-12-04 17:40:22 +0000
commit35b86eed169b848bb1e431abe89ad75694be1848 (patch)
treeb1c6840b56a40ce40259a34be774189b6f8eb529 /jetty-websocket/websocket-client/src
parent1ff23803f74b6288f50ffec11d04fea02eb6998a (diff)
downloadorg.eclipse.jetty.project-35b86eed169b848bb1e431abe89ad75694be1848.tar.gz
org.eclipse.jetty.project-35b86eed169b848bb1e431abe89ad75694be1848.tar.xz
org.eclipse.jetty.project-35b86eed169b848bb1e431abe89ad75694be1848.zip
454152 - Remove mux remnants from WebSocketClient
Diffstat (limited to 'jetty-websocket/websocket-client/src')
-rw-r--r--jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectionManager.java29
1 files changed, 0 insertions, 29 deletions
diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectionManager.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectionManager.java
index cb04029882..f38b3c409b 100644
--- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectionManager.java
+++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectionManager.java
@@ -33,7 +33,6 @@ import org.eclipse.jetty.util.component.ContainerLifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.StatusCode;
-import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.common.WebSocketSession;
@@ -104,20 +103,6 @@ public class ConnectionManager extends ContainerLifeCycle
}
}
- private class VirtualConnect extends ConnectPromise
- {
- public VirtualConnect(WebSocketClient client, EventDriver driver, ClientUpgradeRequest request)
- {
- super(client,driver,request);
- }
-
- @Override
- public void run()
- {
- failed(new WebSocketException("MUX Not yet supported"));
- }
- }
-
private static final Logger LOG = Log.getLogger(ConnectionManager.class);
public static InetSocketAddress toSocketAddress(URI uri)
@@ -187,14 +172,6 @@ public class ConnectionManager extends ContainerLifeCycle
public ConnectPromise connect(WebSocketClient client, EventDriver driver, ClientUpgradeRequest request)
{
- URI toUri = request.getRequestURI();
- String hostname = toUri.getHost();
-
- if (isVirtualConnectionPossibleTo(hostname))
- {
- return new VirtualConnect(client,driver,request);
- }
-
return new PhysicalConnect(client,driver,request);
}
@@ -228,12 +205,6 @@ public class ConnectionManager extends ContainerLifeCycle
return Collections.unmodifiableCollection(sessions);
}
- public boolean isVirtualConnectionPossibleTo(String hostname)
- {
- // TODO Auto-generated method stub
- return false;
- }
-
/**
* Factory method for new WebSocketClientSelectorManager (used by other projects like cometd)
*

Back to the top