diff options
author | Audrius Meskauskas <audriusa@Bioinformatics.org> | 2006-04-09 12:01:59 +0000 |
---|---|---|
committer | Audrius Meskauskas <audriusa@Bioinformatics.org> | 2006-04-09 12:01:59 +0000 |
commit | 25d0f4e0b5c5394910f3a04a62feb10005ce45fe (patch) | |
tree | 9807e68f35cc6d8ec56bd7a75e0d88d1f83c4368 /gnu/CORBA | |
parent | 7ebbbeb22d59ce222c37f3fe1274371d30e1fb2c (diff) | |
download | classpath-25d0f4e0b5c5394910f3a04a62feb10005ce45fe.tar.gz |
2006-04-09 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* 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.
Diffstat (limited to 'gnu/CORBA')
-rw-r--r-- | gnu/CORBA/GIOP/MessageHeader.java | 2 | ||||
-rw-r--r-- | gnu/CORBA/IorDelegate.java | 15 | ||||
-rw-r--r-- | gnu/CORBA/SocketRepository.java | 3 |
3 files changed, 2 insertions, 18 deletions
diff --git a/gnu/CORBA/GIOP/MessageHeader.java b/gnu/CORBA/GIOP/MessageHeader.java index ae8e55c27..025283858 100644 --- a/gnu/CORBA/GIOP/MessageHeader.java +++ b/gnu/CORBA/GIOP/MessageHeader.java @@ -371,7 +371,7 @@ public class MessageHeader } catch (IOException ex) { - MARSHAL t = new MARSHAL(); + MARSHAL t = new MARSHAL(ex.getMessage()); t.minor = Minor.Header; t.initCause(ex); throw t; diff --git a/gnu/CORBA/IorDelegate.java b/gnu/CORBA/IorDelegate.java index 27fb5de9a..8eb43aa7d 100644 --- a/gnu/CORBA/IorDelegate.java +++ b/gnu/CORBA/IorDelegate.java @@ -407,20 +407,7 @@ public class IorDelegate extends SimpleDelegate */ 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. } /** diff --git a/gnu/CORBA/SocketRepository.java b/gnu/CORBA/SocketRepository.java index e48a9a5da..5d4a5099c 100644 --- a/gnu/CORBA/SocketRepository.java +++ b/gnu/CORBA/SocketRepository.java @@ -116,9 +116,6 @@ public class SocketRepository */ public static Socket get_socket(Object key) { - if (true) - return null; - synchronized (sockets) { Socket s = (Socket) sockets.get(key); |