diff options
| author | Simone Bordet | 2014-09-01 09:57:09 +0000 |
|---|---|---|
| committer | Simone Bordet | 2014-09-01 09:57:09 +0000 |
| commit | ee3ab1f8eac04a5a30b3836f07513442b9565c2d (patch) | |
| tree | bc3dc522d68307a872190cd2e7ca858b09ec6621 /jetty-spdy | |
| parent | 277ca5c06585dae9157953d72bc0b040d36262c0 (diff) | |
| parent | 9dbd2cd9d8c7c1336c5ff62b9f8cb670cbf504b6 (diff) | |
| download | org.eclipse.jetty.project-ee3ab1f8eac04a5a30b3836f07513442b9565c2d.tar.gz org.eclipse.jetty.project-ee3ab1f8eac04a5a30b3836f07513442b9565c2d.tar.xz org.eclipse.jetty.project-ee3ab1f8eac04a5a30b3836f07513442b9565c2d.zip | |
Merged branch 'master' into 'jetty-http2'.
Diffstat (limited to 'jetty-spdy')
| -rw-r--r-- | jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java index e39e6856af..2dd7ea7594 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java @@ -157,7 +157,6 @@ public class SPDYClient channel.bind(bindAddress); configure(channel); channel.configureBlocking(false); - channel.connect(address); context.put(SslClientConnectionFactory.SSL_PEER_HOST_CONTEXT_KEY, ((InetSocketAddress)address).getHostString()); context.put(SslClientConnectionFactory.SSL_PEER_PORT_CONTEXT_KEY, ((InetSocketAddress)address).getPort()); @@ -165,7 +164,10 @@ public class SPDYClient context.put(SPDYClientConnectionFactory.SPDY_SESSION_LISTENER_CONTEXT_KEY, listener); context.put(SPDYClientConnectionFactory.SPDY_SESSION_PROMISE_CONTEXT_KEY, promise); - factory.selector.connect(channel, context); + if (channel.connect(address)) + factory.selector.accept(channel, context); + else + factory.selector.connect(channel, context); } catch (IOException x) { |