Re: [cp-patches] RFC: some missing DeleteLocalRef patches

[Christian Thalinger]

Ok, next time i'll send immediately a changelog.  These are commited.

TWISTI


2005-11-22  Christian Thalinger  <address@hidden>

        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c
        (nativeGetFontFamilies): Added missing DeleteLocalRef calls.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
        (query_formats): Likewise.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c 
        (append): Likewise.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c 
        (append): Likewise.
        * native/jni/qt-peer/qtmenupeer.cpp (runEvent): Likewise.


Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c,v
retrieving revision 1.4
diff -u -3 -p -r1.4 gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c
11 Jul 2005 23:27:43 -0000      1.4
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c
21 Nov 2005 23:13:17 -0000
@@ -71,6 +71,7 @@ Java_gnu_java_awt_peer_gtk_GdkGraphicsEn
       const char *name_tmp =  pango_font_family_get_name
(families[idx]);
       jstring name = (*env)->NewStringUTF (env, name_tmp);
       (*env)->SetObjectArrayElement (env, family_name, idx, name);
+      (*env)->DeleteLocalRef(env, name);
     }
   g_free (families);
 
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
===================================================================
RCS
file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,v
retrieving revision 1.19
diff -u -3 -p -r1.19 gnu_java_awt_peer_gtk_GtkChoicePeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c   25 Aug
2005 02:26:50 -0000      1.19
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c   21 Nov
2005 23:13:17 -0000
@@ -121,6 +121,7 @@ Java_gnu_java_awt_peer_gtk_GtkChoicePeer
       gtk_combo_box_append_text (GTK_COMBO_BOX (ptr), label);
 
       (*env)->ReleaseStringUTFChars (env, item, label);
+      (*env)->DeleteLocalRef(env, item);
     }
 
   gdk_threads_leave ();
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c
===================================================================
RCS
file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,v
retrieving revision 1.22
diff -u -3 -p -r1.22 gnu_java_awt_peer_gtk_GtkListPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c     18 Aug
2005 03:15:15 -0000      1.22
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c     21 Nov
2005 23:13:17 -0000
@@ -239,6 +239,7 @@ Java_gnu_java_awt_peer_gtk_GtkListPeer_a
                           COLUMN_STRING, text,
                           -1);
       (*env)->ReleaseStringUTFChars (env, item, text);
+      (*env)->DeleteLocalRef(env, item);
     }
 
   gdk_threads_leave ();
Index: native/jni/qt-peer/qtmenupeer.cpp
===================================================================
RCS
file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtmenupeer.cpp,v
retrieving revision 1.4
diff -u -3 -p -r1.4 qtmenupeer.cpp
--- native/jni/qt-peer/qtmenupeer.cpp   23 Aug 2005 02:13:48 -0000
1.4
+++ native/jni/qt-peer/qtmenupeer.cpp   21 Nov 2005 23:13:41 -0000
@@ -125,6 +125,7 @@ public:
 
     jclass menuCls = env->GetObjectClass( menuPeer );
     jmethodID mid = env->GetMethodID(menuCls, "add", "(J)V");
+    env->DeleteLocalRef(menuCls);
     env->CallVoidMethod( menuPeer, mid, (jlong)newAction );
 
     env->DeleteGlobalRef( menuPeer );
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
===================================================================
RCS
file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c,v
retrieving revision 1.19
diff -u -3 -p -r1.19 gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
18 Aug 2005 01:22:00 -0000      1.19
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
22 Nov 2005 00:16:51 -0000
@@ -270,6 +270,8 @@ query_formats (JNIEnv *env, jclass clazz
          (*env)->DeleteLocalRef(env, string);
          ++ch;
        }
+
+      (*env)->DeleteLocalRef(env, jformat);
     }
   
   g_slist_free(formats);