costin 02/02/06 11:20:42
Modified: jk/native2/common jk_env.c jk_worker_jni.c
Log:
Updates/fixes.
Revision Changes Path
1.9 +19 -8 jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Index: jk_env.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_env.c 31 Dec 2001 22:25:03 -0000 1.8
+++ jk_env.c 6 Feb 2002 19:20:41 -0000 1.9
@@ -56,9 +56,9 @@
* ========================================================================= */
#include "jk_env.h"
+#include "jk_objCache.h"
-/* Singleton for now */
-jk_env_t *jk_env_singleton;
+jk_env_t *jk_env_globalEnv;
/* Private methods
*/
@@ -69,16 +69,26 @@
*/
jk_env_t* JK_METHOD jk_env_getEnv( char *id, jk_pool_t *pool ) {
- if( jk_env_singleton == NULL ) {
- jk_env_singleton=(jk_env_t *)pool->calloc( NULL, pool, sizeof( jk_env_t ));
- jk_env_singleton->globalPool = pool;
- jk_env_initEnv( (jk_env_t *)jk_env_singleton, id );
+ if( jk_env_globalEnv == NULL ) {
+ jk_env_globalEnv=(jk_env_t *)pool->calloc( NULL, pool, sizeof( jk_env_t ));
+ jk_env_globalEnv->globalPool = pool;
+ jk_env_initEnv( (jk_env_t *)jk_env_globalEnv, id );
}
- return jk_env_singleton;
+ return jk_env_globalEnv;
}
/* ==================== Implementation ==================== */
+static jk_env_t * JK_METHOD jk_env_get( jk_env_t *env )
+{
+ return NULL;
+}
+
+static int JK_METHOD jk_env_put( jk_env_t *parent, jk_env_t *chld )
+{
+
+ return JK_TRUE;
+}
static jk_env_objectFactory_t JK_METHOD jk_env_getFactory(jk_env_t *env,
const char *type,
@@ -107,7 +117,8 @@
return result;
}
-static void *jk_env_getInstance( jk_env_t *_this, jk_pool_t *pool, const char
*type, const char *name )
+static void *jk_env_getInstance( jk_env_t *_this, jk_pool_t *pool,
+ const char *type, const char *name )
{
jk_env_objectFactory_t fac;
void *result;
1.2 +2 -1 jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c
Index: jk_worker_jni.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_worker_jni.c 26 Jan 2002 06:48:17 -0000 1.1
+++ jk_worker_jni.c 6 Feb 2002 19:20:41 -0000 1.2
@@ -198,7 +198,8 @@
if( jniWorker->jk_java_bridge_class == NULL ) {
env->l->jkLog(env, env->l, JK_LOG_EMERG,
- "Can't find class %s\n", str_config);
+ "Can't find class %s in %s\n", str_config,
+ jniWorker->vm->tomcat_classpath );
/* [V] the detach here may segfault on 1.1 JVM... */
jniWorker->vm->detach(env, jniWorker->vm);
return JK_FALSE;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
