[cp-patches] FYI: CORBA socket reusing fixes.

[Audrius Meskauskas]

2006-04-09  Audrius Meskauskas  <[EMAIL PROTECTED]>

   * gnu/CORBA/GIOP/MessageHeader.java (write):
   More informative exception.
   * gnu/CORBA/IorDelegate.java (release): Do not close the socket.
   * gnu/CORBA/SocketRepository.java (get_socket):
   Removed debugging code.


Index: IorDelegate.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/IorDelegate.java,v
retrieving revision 1.2
diff -u -r1.2 IorDelegate.java
--- IorDelegate.java	28 Oct 2005 13:01:50 -0000	1.2
+++ IorDelegate.java	9 Apr 2006 11:57:16 -0000
@@ -407,20 +407,7 @@
    */
   public void release(org.omg.CORBA.Object target)
   {
-    String key = ior.Internet.host + ":" + ior.Internet.port;
-
-    Socket socket = SocketRepository.get_socket(key);
-    try
-      {
-        if (socket != null)
-          {
-            socket.close();
-          }
-      }
-    catch (IOException ex)
-      {
-        // do nothing, then.
-      }
+    // Do nothing here.
   }
 
   /**
Index: SocketRepository.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/SocketRepository.java,v
retrieving revision 1.5
diff -u -r1.5 SocketRepository.java
--- SocketRepository.java	4 Nov 2005 21:34:29 -0000	1.5
+++ SocketRepository.java	9 Apr 2006 11:57:16 -0000
@@ -116,9 +116,6 @@
    */
   public static Socket get_socket(Object key)
   {
-    if (true)
-      return null;
-
     synchronized (sockets)
       {
         Socket s = (Socket) sockets.get(key);
Index: GIOP/MessageHeader.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/GIOP/MessageHeader.java,v
retrieving revision 1.10
diff -u -r1.10 MessageHeader.java
--- GIOP/MessageHeader.java	9 Apr 2006 09:50:32 -0000	1.10
+++ GIOP/MessageHeader.java	9 Apr 2006 11:57:18 -0000
@@ -371,7 +371,7 @@
       }
     catch (IOException ex)
       {
-        MARSHAL t = new MARSHAL();
+        MARSHAL t = new MARSHAL(ex.getMessage());
         t.minor = Minor.Header;
         t.initCause(ex);
         throw t;