Dont' map null exception.

ikvmnet · Apr 15, 2024 · c526a05 · c526a05
1 parent 1daf236
commit c526a05
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/IKVM.Runtime/JNI/JNIEnv.cs b/src/IKVM.Runtime/JNI/JNIEnv.cs
@@ -603,7 +603,7 @@ static object InvokeHelper(JNIEnv* pEnv, nint objHandle, nint methodID, JValue*
             }
             catch (Exception e)
             {
-                JVM.SetPendingException(ikvm.runtime.Util.mapException(e));
+                JVM.SetPendingException(e);
                 return null;
             }
         }
@@ -2391,7 +2391,7 @@ internal static jobject NewDirectByteBuffer(JNIEnv* pEnv, IntPtr address, jlong
             }
             catch (Exception x)
             {
-                JVM.SetPendingException(ikvm.runtime.Util.mapException(x));
+                JVM.SetPendingException(x);
                 return (void*)IntPtr.Zero;
             }
         }
@@ -2404,7 +2404,7 @@ internal static jlong GetDirectBufferCapacity(JNIEnv* pEnv, jobject buf)
             }
             catch (Exception x)
             {
-                JVM.SetPendingException(ikvm.runtime.Util.mapException(x));
+                JVM.SetPendingException(x);
                 return 0;
             }
         }

diff --git a/src/IKVM.Runtime/JVM.cs b/src/IKVM.Runtime/JVM.cs
@@ -168,7 +168,7 @@ internal static Exception GetPendingException()
         /// <param name="e"></param>
         internal static void SetPendingException(Exception e)
         {
-            pendingException = ikvm.runtime.Util.mapException(e);
+            pendingException = e != null ? ikvm.runtime.Util.mapException(e) : null;
         }
 
         /// <summary>