tzmappings is only a windows file.

JNIEnv: handle exceptions for casting
ikvmnet · Jun 10, 2024 · 94e1c6c · 94e1c6c
1 parent 284f219
commit 94e1c6c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/src/IKVM.MSBuild.Tests/ProjectTests.cs b/src/IKVM.MSBuild.Tests/ProjectTests.cs
@@ -295,7 +295,10 @@ public void CanBuildTestProject(EnvironmentPreference env, string tfm, string ri
                 File.Exists(Path.Combine(outDir, "ikvm", rid, "bin", "IKVM.Runtime.dll")).Should().BeTrue();
                 File.Exists(Path.Combine(outDir, "ikvm", rid, "bin", "IKVM.Java.dll")).Should().BeTrue();
                 File.Exists(Path.Combine(outDir, "ikvm", rid, "lib", "tzdb.dat")).Should().BeTrue();
-                File.Exists(Path.Combine(outDir, "ikvm", rid, "lib", "tzmappings")).Should().BeTrue();
+
+                if (rid.StartsWith("win-"))
+                    File.Exists(Path.Combine(outDir, "ikvm", rid, "lib", "tzmappings")).Should().BeTrue();
+
                 File.Exists(Path.Combine(outDir, "ikvm", rid, "lib", "currency.data")).Should().BeTrue();
                 File.Exists(Path.Combine(outDir, "ikvm", rid, "lib", "security", "java.policy")).Should().BeTrue();
                 File.Exists(Path.Combine(outDir, "ikvm", rid, "lib", "security", "java.security")).Should().BeTrue();

diff --git a/src/IKVM.NET.Sdk.Tests/ProjectTests.cs b/src/IKVM.NET.Sdk.Tests/ProjectTests.cs
@@ -282,8 +282,13 @@ public void CanBuildTestProject(EnvironmentPreference env, string tfm, string ri
                 Directory.Exists(Path.Combine(outDir, "ikvm", rid)).Should().BeTrue();
                 Directory.Exists(Path.Combine(outDir, "ikvm", rid, "bin")).Should().BeTrue();
                 File.Exists(Path.Combine(outDir, "ikvm", rid, "TRADEMARK")).Should().BeTrue();
+                File.Exists(Path.Combine(outDir, "ikvm", rid, "bin", "IKVM.Runtime.dll")).Should().BeTrue();
+                File.Exists(Path.Combine(outDir, "ikvm", rid, "bin", "IKVM.Java.dll")).Should().BeTrue();
                 File.Exists(Path.Combine(outDir, "ikvm", rid, "lib", "tzdb.dat")).Should().BeTrue();
-                File.Exists(Path.Combine(outDir, "ikvm", rid, "lib", "tzmappings")).Should().BeTrue();
+
+                if (rid.StartsWith("win-"))
+                    File.Exists(Path.Combine(outDir, "ikvm", rid, "lib", "tzmappings")).Should().BeTrue();
+
                 File.Exists(Path.Combine(outDir, "ikvm", rid, "lib", "currency.data")).Should().BeTrue();
                 File.Exists(Path.Combine(outDir, "ikvm", rid, "lib", "security", "java.policy")).Should().BeTrue();
                 File.Exists(Path.Combine(outDir, "ikvm", rid, "lib", "security", "java.security")).Should().BeTrue();

diff --git a/src/IKVM.Runtime/JNI/JNIEnv.cs b/src/IKVM.Runtime/JNI/JNIEnv.cs
@@ -2197,10 +2197,22 @@ internal static void SetObjectArrayElement(JNIEnv* pEnv, nint array, jsize index
                 // we want to support (non-primitive) value types so we can't cast to object[]
                 ((Array)pEnv->UnwrapRef(array)).SetValue(pEnv->UnwrapRef(val), index);
             }
+            catch (NullReferenceException)
+            {
+                JVM.SetPendingException(new java.lang.NullPointerException());
+            }
+            catch (InvalidCastException)
+            {
+                JVM.SetPendingException(new java.lang.ArrayStoreException());
+            }
             catch (IndexOutOfRangeException)
             {
                 JVM.SetPendingException(new java.lang.ArrayIndexOutOfBoundsException());
             }
+            catch (Exception e)
+            {
+                JVM.SetPendingException(e);
+            }
         }
 
         internal static nint NewBooleanArray(JNIEnv* pEnv, jsize len)