trim more stuff, dont delete refs for objects passed into methods ove…

…rriden in the clr
koush · May 24, 2010 · 46e6360 · 46e6360
1 parent 9c4c411
commit 46e6360
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git a/java/lang/Object.cs b/java/lang/Object.cs
@@ -56,6 +56,11 @@ void IJvmProxy.Init(JNIEnv env, JniLocalHandle obj)
             env.DeleteLocalRef(obj);
         }
 
+        void IJvmProxy.InitNoDelete(JNIEnv env, JniLocalHandle obj)
+        {
+            jvmHandle = env.NewGlobalRef(obj);
+        }
+
         void IJvmProxy.Copy(JNIEnv env, JniGlobalHandle obj)
         {
             jvmHandle = obj;

diff --git a/java/lang/Throwable.cs b/java/lang/Throwable.cs
@@ -124,6 +124,11 @@ void IJvmProxy.Init(JNIEnv env, JniLocalHandle obj)
             jvmHandle = env.NewGlobalRef(obj);
             env.DeleteLocalRef(obj);
         }
+
+        void IJvmProxy.InitNoDelete(JNIEnv env, JniLocalHandle obj)
+        {
+            jvmHandle = env.NewGlobalRef(obj);
+        }
 
         void IJvmProxy.Copy(JNIEnv env, JniGlobalHandle obj)
         {

diff --git a/jni/IJvmProxy.cs b/jni/IJvmProxy.cs
@@ -33,6 +33,8 @@ public interface IJvmProxy : IObject
 
         void Init(JNIEnv env, JniLocalHandle obj);
 
+        void InitNoDelete(JNIEnv env, JniLocalHandle obj);
+
         void Copy(JNIEnv env, JniGlobalHandle obj);
     }
 }
diff --git a/jni4net.n.androidmono.csproj b/jni4net.n.androidmono.csproj
@@ -138,7 +138,6 @@
     <Compile Include="generated\java\util\Map.generated.cs" />
     <Compile Include="generated\java\util\Properties.generated.cs" />
     <Compile Include="generated\java\util\Set.generated.cs" />
-    <Compile Include="generated\java_\lang\IObject.generated.cs" />
     <Compile Include="java\lang\Class.cs" />
     <Compile Include="java\lang\Integer.cs" />
     <Compile Include="java\lang\IObject.cs" />
@@ -166,7 +165,6 @@
     <Compile Include="adaptors\Disposable.cs" />
     <Compile Include="adaptors\Enumerator.cs" />
     <Compile Include="AssemblyInf.cs" />
-    <Compile Include="Bridge.JVM.convertor.cs" />
     <Compile Include="BridgeSetup.cs" />
     <Compile Include="generated\java\io\ByteArrayInputStream.generated.cs" />
     <Compile Include="generated\java\io\ByteArrayOutputStream.generated.cs" />

diff --git a/utils/Convertor.J2C.strong.cs b/utils/Convertor.J2C.strong.cs
@@ -52,7 +52,7 @@ public static object StrongJ2CpUntyped(IntPtr ptr)
             }
             Class clazz = env.GetObjectClass(obj);
             RegistryRecord record = Registry.GetJVMRecord(clazz);
-            return record.CreateCLRProxy(env, obj);
+            return record.CreateCLRProxyNoDelete(env, obj);
         }
 
         private class ConstructerHelper<T>
@@ -73,7 +73,7 @@ public static TRes StrongJ2CpTyped<TRes>(IntPtr ptr)
         {
             var env = JNIEnv.ThreadEnv;
             var ret = ConstructerHelper<TRes>.Create(env);
-            (ret as IJvmProxy).Init(env, ptr);
+            (ret as IJvmProxy).InitNoDelete(env, ptr);
             return ret;
         }
 

diff --git a/utils/RegistryRecord.cs b/utils/RegistryRecord.cs
@@ -70,6 +70,13 @@ internal IJvmProxy CreateCLRProxy(JNIEnv env, JniLocalHandle obj)
             proxy.Init(env, obj);
             return proxy;
         }
+
+        internal IJvmProxy CreateCLRProxyNoDelete(JNIEnv env, JniLocalHandle obj)
+        {
+            IJvmProxy proxy = CLRConstructor.CreateProxy(env);
+            proxy.InitNoDelete(env, obj);
+            return proxy;
+        }
 
         internal IJvmProxy CopyCLRProxy(JNIEnv env, JniGlobalHandle obj)
         {