cvs commit: jakarta-tomcat-connectors/jni/native/src pool.c proc.c

[mturk]

mturk       2005/05/31 23:34:23

  Modified:    jni/native/src pool.c proc.c
  Log:
  Use method id array for callback handler
  
  Revision  Changes    Path
  1.7       +5 -5      jakarta-tomcat-connectors/jni/native/src/pool.c
  
  Index: pool.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/pool.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- pool.c    28 May 2005 07:48:29 -0000      1.6
  +++ pool.c    1 Jun 2005 06:34:23 -0000       1.7
  @@ -32,7 +32,7 @@
   
       if (data) {
           if (!TCN_IS_NULL(cb->env, cb->obj)) {
  -            rv = (*(cb->env))->CallIntMethod(cb->env, cb->obj, cb->mid,
  +            rv = (*(cb->env))->CallIntMethod(cb->env, cb->obj, cb->mid[0],
                                                NULL);
               TCN_UNLOAD_CLASS(cb->env, cb->obj);
           }
  @@ -115,9 +115,9 @@
          return 0;
       }
       cls = (*e)->GetObjectClass(e, obj);
  -    cb->env = e;
  -    cb->obj = (*e)->NewGlobalRef(e, obj);
  -    cb->mid = (*e)->GetMethodID(e, cls, "callback", "()I");
  +    cb->env    = e;
  +    cb->obj    = (*e)->NewGlobalRef(e, obj);
  +    cb->mid[0] = (*e)->GetMethodID(e, cls, "callback", "()I");
   
       apr_pool_cleanup_register(p, (const void *)cb,
                                 generic_pool_cleanup,
  
  
  
  1.4       +5 -5      jakarta-tomcat-connectors/jni/native/src/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/proc.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- proc.c    24 May 2005 09:24:40 -0000      1.3
  +++ proc.c    1 Jun 2005 06:34:23 -0000       1.4
  @@ -39,7 +39,7 @@
       cb = (tcn_callback_t *)data;
       if (cb) {
           if (!TCN_IS_NULL(cb->env, cb->obj)) {
  -            (*(cb->env))->CallVoidMethod(cb->env, cb->obj, cb->mid,
  +            (*(cb->env))->CallVoidMethod(cb->env, cb->obj, cb->mid[0],
                                   P2J(pool), (jint)err,
                                   (*(cb->env))->NewStringUTF(cb->env, 
description),
                                   NULL);
  @@ -373,9 +373,9 @@
          return;
       }
       cls = (*e)->GetObjectClass(e, obj);
  -    cb->env = e;
  -    cb->obj = (*e)->NewGlobalRef(e, obj);
  -    cb->mid = (*e)->GetMethodID(e, cls, "callback", 
"(JILjava/lang/String;)V");
  +    cb->env    = e;
  +    cb->obj    = (*e)->NewGlobalRef(e, obj);
  +    cb->mid[0] = (*e)->GetMethodID(e, cls, "callback", 
"(JILjava/lang/String;)V");
   
       apr_pool_userdata_setn(cb, ERRFN_USERDATA_KEY, child_errfn_pool_cleanup, 
p);
       apr_procattr_child_errfn_set(a, generic_child_errfn);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]