[java-atk-wrapper] Add debug messages for global_ac == NULL



commit 1702923a68219df3133965773a2ce376457344a3
Author: Magdalen Berns <m berns thismagpie com>
Date:   Mon Jan 19 20:17:56 2015 +0000

    Add debug messages for global_ac == NULL
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=743203

 jni/src/AtkWrapper.c |   99 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 95 insertions(+), 4 deletions(-)
---
diff --git a/jni/src/AtkWrapper.c b/jni/src/AtkWrapper.c
index d186c4a..95a638d 100644
--- a/jni/src/AtkWrapper.c
+++ b/jni/src/AtkWrapper.c
@@ -198,7 +198,7 @@ static CallbackPara*
 alloc_callback_para (jobject ac)
 {
   if (ac == NULL)
-    return;
+    return NULL;
   CallbackPara *para = g_new(CallbackPara, 1);
   para->global_ac = ac;
   para->args = NULL;
@@ -209,7 +209,20 @@ alloc_callback_para (jobject ac)
 static void
 free_callback_para (CallbackPara *para)
 {
-       JNIEnv *jniEnv = jaw_util_get_jni_env();
+  JNIEnv *jniEnv = jaw_util_get_jni_env();
+  if (jniEnv == NULL)
+  {
+    free_callback_para(para);
+    return;
+  }
+
+  if (para->global_ac == NULL)
+  {
+    fprintf(stderr,"\n *** free_callback_para: para->global_ac == NULL *** \n");
+    free_callback_para(para);
+    return;
+  }
+
        (*jniEnv)->DeleteGlobalRef(jniEnv, para->global_ac);
 
        if (para->args) {
@@ -232,6 +245,13 @@ focus_notify_handler (gpointer p)
     return FALSE;
   }
 
+  if (global_ac == NULL)
+  {
+         fprintf(stderr,"\n *** focus_notify_handler: global_ac == NULL *** \n");
+    free_callback_para(para);
+    return FALSE;
+  }
+
   JawImpl* jaw_impl = jaw_impl_get_instance(jniEnv, global_ac);
   if (jaw_impl == NULL)
   {
@@ -273,6 +293,13 @@ window_open_handler (gpointer p)
     return FALSE;
   }
 
+  if (global_ac == NULL)
+  {
+    fprintf(stderr,"\n *** window_open_handler: global_ac == NULL *** \n");
+    free_callback_para(para);
+    return FALSE;
+  }
+
   JawImpl* jaw_impl = jaw_impl_get_instance(jniEnv, global_ac);
   AtkObject* atk_obj = ATK_OBJECT(jaw_impl);
 
@@ -338,6 +365,13 @@ window_close_handler (gpointer p)
     return FALSE;
   }
 
+  if (global_ac == NULL)
+  {
+    fprintf(stderr,"\n *** window_closed_handler: global_ac == NULL *** \n");
+    free_callback_para(para);
+    return FALSE;
+  }
+
   JawImpl* jaw_impl = jaw_impl_find_instance(jniEnv, global_ac);
 
   if (jaw_impl == NULL)
@@ -407,6 +441,13 @@ window_minimize_handler (gpointer p)
     return FALSE;
   }
 
+  if (global_ac == NULL)
+  {
+    fprintf(stderr,"\n *** window_minimize_handler: global_ac == NULL *** \n");
+    free_callback_para(para);
+    return FALSE;
+  }
+
   JawImpl* jaw_impl = jaw_impl_find_instance(jniEnv, global_ac);
 
   if (jaw_impl == NULL)
@@ -448,6 +489,13 @@ window_maximize_handler (gpointer p)
     return FALSE;
   }
 
+  if (global_ac == NULL)
+  {
+    fprintf(stderr,"\n *** window_maximize_handler: global_ac == NULL *** \n");
+    free_callback_para(para);
+    return FALSE;
+  }
+
   JawImpl* jaw_impl = jaw_impl_find_instance(jniEnv, global_ac);
 
   if (jaw_impl == NULL)
@@ -488,6 +536,13 @@ window_restore_handler (gpointer p)
     return FALSE;
   }
 
+  if (global_ac == NULL)
+  {
+    fprintf(stderr,"\n *** window_restore_handler: global_ac == NULL *** \n");
+    free_callback_para(para);
+    return FALSE;
+  }
+
   JawImpl* jaw_impl = jaw_impl_find_instance(jniEnv, global_ac);
 
   if (jaw_impl == NULL)
@@ -529,6 +584,13 @@ window_activate_handler (gpointer p)
     return FALSE;
   }
 
+  if (global_ac == NULL)
+  {
+    fprintf(stderr,"\n *** window_activate_handler: global_ac == NULL *** \n");
+    free_callback_para(para);
+    return FALSE;
+  }
+
   JawImpl* jaw_impl = jaw_impl_get_instance(jniEnv, global_ac);
 
   if (jaw_impl == NULL)
@@ -568,6 +630,13 @@ window_deactivate_handler (gpointer p)
     return FALSE;
   }
 
+  if (global_ac == NULL)
+  {
+    fprintf(stderr,"\n *** window_deactivate_handler: global_ac == NULL *** \n");
+    free_callback_para(para);
+    return FALSE;
+  }
+
   JawImpl* jaw_impl = jaw_impl_find_instance(jniEnv, global_ac);
 
   if (jaw_impl == NULL)
@@ -611,6 +680,13 @@ window_state_change_handler (gpointer p)
     return FALSE;
   }
 
+  if (global_ac == NULL)
+  {
+    fprintf(stderr,"\n *** window_state_change_handler: global_ac == NULL *** \n");
+    free_callback_para(para);
+    return FALSE;
+  }
+
   JawImpl* jaw_impl = jaw_impl_get_instance(jniEnv, global_ac);
 
   if (jaw_impl == NULL)
@@ -693,6 +769,14 @@ signal_emit_handler (gpointer p)
   }
 
   jobjectArray args = para->args;
+
+  if (global_ac == NULL)
+  {
+    fprintf(stderr,"\n *** signal_emit_handler: global_ac == NULL *** \n");
+    free_callback_para(para);
+    return FALSE;
+  }
+
   JawImpl* jaw_impl = jaw_impl_find_instance(jniEnv, global_ac);
 
   if (jaw_impl == NULL)
@@ -970,6 +1054,13 @@ object_state_change_handler (gpointer p)
     return FALSE;
   }
 
+  if (global_ac == NULL)
+  {
+    fprintf(stderr,"\n *** object_state_change_handler: global_ac == NULL *** \n");
+    free_callback_para(para);
+    return FALSE;
+  }
+
   JawImpl* jaw_impl = jaw_impl_find_instance(jniEnv, global_ac);
 
   if (jaw_impl == NULL)
@@ -1025,7 +1116,7 @@ component_added_handler (gpointer p)
 
   if (global_ac == NULL)
   {
-    fprintf(stderr,"\n *** component_added_handler: lock == NULL *** \n");
+    fprintf(stderr,"\n *** component_added_handler: global_ac == NULL *** \n");
     free_callback_para(para);
     return FALSE;
   }
@@ -1074,7 +1165,7 @@ component_removed_handler (gpointer p)
 
   if (global_ac == NULL)
   {
-    fprintf(stderr,"\n *** component_removed_handler: lock == NULL *** \n");
+    fprintf(stderr,"\n *** component_removed_handler: global_ac == NULL *** \n");
     free_callback_para(para);
     return FALSE;
   }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]