diff options
| author | Simone Bordet | 2014-09-01 09:26:02 +0000 |
|---|---|---|
| committer | Simone Bordet | 2014-09-01 09:28:59 +0000 |
| commit | 9dbd2cd9d8c7c1336c5ff62b9f8cb670cbf504b6 (patch) | |
| tree | b26ca89c310eea6d4df8c841e069b078d0712273 /jetty-websocket/websocket-client/src | |
| parent | ca2a23c35d8daed2215a7f69a2b7b3dd0a65dadd (diff) | |
| download | org.eclipse.jetty.project-9dbd2cd9d8c7c1336c5ff62b9f8cb670cbf504b6.tar.gz org.eclipse.jetty.project-9dbd2cd9d8c7c1336c5ff62b9f8cb670cbf504b6.tar.xz org.eclipse.jetty.project-9dbd2cd9d8c7c1336c5ff62b9f8cb670cbf504b6.zip | |
442950 - Embedded Jetty client requests to localhost hangs with high cpu usage (NIO OP_CONNECT Solaris/Sparc).
Now checking the return value of SocketChannel.connect() to determine
whether to register the channel (true) or finish the connect (false).
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.java | 10 |
1 files changed, 8 insertions, 2 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 ab20d77d9d..cb04029882 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 @@ -74,8 +74,14 @@ public class ConnectionManager extends ContainerLifeCycle InetSocketAddress address = toSocketAddress(wsUri); - channel.connect(address); - getSelector().connect(channel,this); + if (channel.connect(address)) + { + getSelector().accept(channel, this); + } + else + { + getSelector().connect(channel, this); + } } catch (Throwable t) { |