From 7cb088d1299ccd3e381f485a9bc2e4cdcb3dafbe Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 11 Jun 2024 21:08:27 -0500 Subject: [PATCH] No need for this. --- .../Java/Externs/java/io/WinNTFileSystem.cs | 51 ++++++++----------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/src/IKVM.Runtime/Java/Externs/java/io/WinNTFileSystem.cs b/src/IKVM.Runtime/Java/Externs/java/io/WinNTFileSystem.cs index fc2459047..d84a9d7d1 100644 --- a/src/IKVM.Runtime/Java/Externs/java/io/WinNTFileSystem.cs +++ b/src/IKVM.Runtime/Java/Externs/java/io/WinNTFileSystem.cs @@ -540,40 +540,33 @@ public static string[] list(object self, object f) #if FIRST_PASS throw new NotImplementedException(); #else - try + if (JVM.Vfs.IsPath(((global::java.io.File)f).getPath())) { - if (JVM.Vfs.IsPath(((global::java.io.File)f).getPath())) - { - if (JVM.Vfs.GetEntry(((global::java.io.File)f).getPath()) is VfsDirectory vfs) - return vfs.List(); + if (JVM.Vfs.GetEntry(((global::java.io.File)f).getPath()) is VfsDirectory vfs) + return vfs.List(); - return null; + return null; + } + else + { + __callerID ??= global::ikvm.@internal.CallerID.create(WinNTFileSystemAccessor.Type.TypeHandle); + __jniPtr__list ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__list>(JNIFrame.GetFuncPtr(__callerID, "java/io/WinNTFileSystem", nameof(list), "(Ljava/io/File;)[Ljava/lang/String;")); + var jniFrm = new JNIFrame(); + var jniEnv = jniFrm.Enter(__callerID); + try + { + return (string[])jniFrm.UnwrapLocalRef(__jniPtr__list(jniEnv, jniFrm.MakeLocalRef(self), jniFrm.MakeLocalRef(f))); } - else + catch (Exception ex) { - __callerID ??= global::ikvm.@internal.CallerID.create(WinNTFileSystemAccessor.Type.TypeHandle); - __jniPtr__list ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__list>(JNIFrame.GetFuncPtr(__callerID, "java/io/WinNTFileSystem", nameof(list), "(Ljava/io/File;)[Ljava/lang/String;")); - var jniFrm = new JNIFrame(); - var jniEnv = jniFrm.Enter(__callerID); - try - { - return (string[])jniFrm.UnwrapLocalRef(__jniPtr__list(jniEnv, jniFrm.MakeLocalRef(self), jniFrm.MakeLocalRef(f))); - } - catch (Exception ex) - { - System.Console.WriteLine("*** exception in native code ***"); - System.Console.WriteLine(ex); - throw; - } - finally - { - jniFrm.Leave(); - } + System.Console.WriteLine("*** exception in native code ***"); + System.Console.WriteLine(ex); + throw; + } + finally + { + jniFrm.Leave(); } - } - catch (global::java.lang.NegativeArraySizeException e) - { - throw new global::java.lang.NegativeArraySizeException("listing " + ((global::java.io.File)f).getPath()); } #endif }