[gf-corba-v3-mirror~gfv2-master:23] 6901999 rich client (ACC) TCP RST packet results into IDLE socket tied to

[kk105552@kenai.com]

Project:    gf-corba-v3-mirror
Repository: gfv2-master
Revision:   23
Author:     kk105552
Date:       2010-03-12 06:20:19 UTC
Link:       

Log Message:
------------
6901999 rich client (ACC) TCP RST packet results into IDLE socket tied to the 
ORB (SGES v2.1)
Reviewed by: Ken


Revisions:
----------
23


Modified Paths:
---------------
src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java


Diffs:
------
diff -r 2a8178e2a28e -r f5067f1366f1 
src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java
--- 
a/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java
      Tue Feb 02 17:16:58 2010 +0530
+++ 
b/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java
      Thu Mar 11 22:20:19 2010 -0800
@@ -873,42 +873,28 @@
             
             if (socketChannel != null) {
                 closeTemporarySelectors();
-                // NOTE: Until JDK bug 6215050 is fixed in Java 5, do not use
-                //       socketChannel.close(). Instead shutdown input &
-                //       output streams on the Socket and use socket.close().
-                //       JDK bug 6215050 was fixed in JDK 1.5.0_07. Can use
-                //       socketChannel.close() for 1.5.0_07 and later JDKs.
-                if (!socketChannel.socket().isInputShutdown()) {
-                    if (orb.transportDebugFlag) {
-                        dprint("closeSocketAndTemporarySelectors: shutting " 
+
-                               "down Connection socket input stream : " + 
this);
-                    }
-                    socketChannel.socket().shutdownInput();
-                }
-                if (!socketChannel.socket().isOutputShutdown()) {
-                    if (orb.transportDebugFlag) {
-                        dprint("closeSocketAndTemporarySelectors: shutting " 
+
-                               "down Connection socket output stream : " + 
this);
-                    }
-                    socketChannel.socket().shutdownOutput();
-                }
-                if (!socketChannel.socket().isClosed()) {
-                    socketChannel.socket().close();
-                }
+               if (orb.transportDebugFlag) {
+                       dprint("closeSocketAndTemporarySelectors: closing the 
socketChannel") ;
+               }
+               socketChannel.close();
             }
-            
-            if (socket != null && !socket.isClosed()) {
-                socket.close();
-            }
-            
         } catch (IOException e) {
             if (orb.transportDebugFlag) {
                 dprint(".closeSocketAndTemporarySelectors: " + this, e);
             }
         } finally {
-           if (orb.transportDebugFlag) {
+            try {
+               if (socket != null && !socket.isClosed()) {
+                       socket.close();
+               } 
+            } catch (Exception e) {
+               if (orb.transportDebugFlag) {
+                       dprint(".closeSocketAndTemporarySelectors<-: close 
Socket exception"); 
+               }
+            }
+            if (orb.transportDebugFlag) {
                dprint(".closeSocketAndTemporarySelectors<-: " + this);
-            }
+             }
         }
     }