Throw proper exception if fdObj is null.

ikvmnet · Sep 24, 2023 · 67f93fd · 67f93fd
1 parent 9417df4
commit 67f93fd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/IKVM.Runtime/Java/Externs/java/net/SocketInputStream.cs b/src/IKVM.Runtime/Java/Externs/java/net/SocketInputStream.cs
@@ -35,9 +35,12 @@ public static int socketRead0(object this_, object fdObj, byte[] data, int off,
             {
                 return InvokeFunc<global::java.net.SocketInputStream, int>(this_, self =>
                 {
+                    if (fdObj == null)
+                        throw new global::java.net.SocketException("Socket closed");
+
                     var socket = FileDescriptorAccessor.GetSocket(fdObj);
                     if (socket == null)
-                        throw new global::java.net.SocketException("Invalid file handle.");
+                        throw new global::java.net.SocketException("Socket closed");
 
                     if (timeout > 0 && socket.Available == 0)
                     {

diff --git a/src/IKVM.Runtime/Java/Externs/java/net/SocketOutputStream.cs b/src/IKVM.Runtime/Java/Externs/java/net/SocketOutputStream.cs
@@ -48,9 +48,12 @@ public static void socketWrite0(object this_, object fdObj, byte[] data, int off
 
                 InvokeAction<global::java.net.SocketOutputStream>(this_, impl =>
                 {
+                    if (fdObj == null)
+                        throw new global::java.net.SocketException("Socket closed");
+
                     var socket = FileDescriptorAccessor.GetSocket(fdObj);
                     if (socket == null)
-                        throw new global::java.net.SocketException("Invalid file handle.");
+                        throw new global::java.net.SocketException("Socket closed");
 
                     var prevBlocking = socket.Blocking;
                     var prevSendTimeout = socket.SendTimeout;