svn commit: r1498834 - /cxf/trunk/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java

[ningjiang]

Author: ningjiang
Date: Tue Jul  2 08:38:40 2013
New Revision: 1498834

URL: http://svn.apache.org/r1498834
Log:
CXF-5042 Fixed a NettyHttpConduit SSL Session setting error

Modified:
    
cxf/trunk/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java

Modified: 
cxf/trunk/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java?rev=1498834&r1=1498833&r2=1498834&view=diff
==============================================================================
--- 
cxf/trunk/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
 (original)
+++ 
cxf/trunk/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
 Tue Jul  2 08:38:40 2013
@@ -273,16 +273,9 @@ public class NettyHttpConduit extends UR
                     if (future.isSuccess()) {
                         setChannel(future.getChannel());
                         SslHandler sslHandler = 
channel.getPipeline().get(SslHandler.class);
-                        if (!handshakeDone.getAndSet(true) && (sslHandler != 
null)) {
-                            sslHandler.handshake().addListener(this);
-                            return;
-                        } else {
-                            if (sslHandler != null) {
-                                // setup the session for use
-                                session = sslHandler.getEngine().getSession();
-                            }
+                        if (sslHandler != null) {
+                            session = sslHandler.getEngine().getSession();
                         }
-
                     } else {
                         setException((Exception) future.getCause());
                     }