1 files changed, 195 insertions, 92 deletions

diff --git a/db/libdb_java/java_callbacks.i b/db/libdb_java/java_callbacks.i
index 2d38738f0..ae10f2062 100644
--- a/db/libdb_java/java_callbacks.i
+++ b/db/libdb_java/java_callbacks.i
@@ -13,16 +13,17 @@ JAVA_TYPEMAP(_sig, _jclass, jobject)
 %enddef
 
 %{
-static void __dbj_error(const DB_ENV *dbenv, const char *prefix, const char *msg)
+static void __dbj_error(const DB_ENV *dbenv,
+    const char *prefix, const char *msg)
 {
 	JNIEnv *jenv = __dbj_get_jnienv();
 	jobject jdbenv = (jobject)DB_ENV_INTERNAL(dbenv);
 
+	COMPQUIET(prefix, NULL);
+
 	if (jdbenv != NULL)
 		(*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, dbenv_class,
-		    errcall_method,
-		    (*jenv)->NewStringUTF(jenv, prefix),
-		    (*jenv)->NewStringUTF(jenv, msg));
+		    errcall_method, (*jenv)->NewStringUTF(jenv, msg));
 }
 
 static void __dbj_env_feedback(DB_ENV *dbenv, int opcode, int percent)
@@ -30,8 +31,9 @@ static void __dbj_env_feedback(DB_ENV *dbenv, int opcode, int percent)
 	JNIEnv *jenv = __dbj_get_jnienv();
 	jobject jdbenv = (jobject)DB_ENV_INTERNAL(dbenv);
 
-	(*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, dbenv_class,
-	    env_feedback_method, opcode, percent);
+	if (jdbenv != NULL)
+		(*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, dbenv_class,
+		    env_feedback_method, opcode, percent);
 }
 
 static void __dbj_message(const DB_ENV *dbenv, const char *msg)
@@ -49,8 +51,10 @@ static void __dbj_panic(DB_ENV *dbenv, int err)
 	JNIEnv *jenv = __dbj_get_jnienv();
 	jobject jdbenv = (jobject)DB_ENV_INTERNAL(dbenv);
 
-	(*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, dbenv_class,
-	    paniccall_method, __dbj_get_except(jenv, err, NULL, NULL, jdbenv));
+	if (jdbenv != NULL)
+		(*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, dbenv_class,
+		    paniccall_method,
+		    __dbj_get_except(jenv, err, NULL, NULL, jdbenv));
 }
 
 static int __dbj_app_dispatch(DB_ENV *dbenv,
@@ -62,6 +66,9 @@ static int __dbj_app_dispatch(DB_ENV *dbenv,
 	jbyteArray jdbtarr;
 	int ret;
 
+	if (jdbenv == NULL)
+		return (EINVAL);
+
 	jdbt = (*jenv)->NewObject(jenv, dbt_class, dbt_construct);
 	__dbj_dbt_copyout(jenv, dbt, &jdbtarr, jdbt);
 	if (jdbt == NULL)
@@ -76,7 +83,7 @@ static int __dbj_app_dispatch(DB_ENV *dbenv,
 		/* The exception will be thrown, so this could be any error. */
 		ret = EINVAL;
 	}
-	
+
 	(*jenv)->DeleteLocalRef(jenv, jdbtarr);
 	(*jenv)->DeleteLocalRef(jenv, jdbt);
 	if (jlsn != NULL)
@@ -85,6 +92,27 @@ static int __dbj_app_dispatch(DB_ENV *dbenv,
 	return (ret);
 }
 
+static void __dbj_event_notify(DB_ENV *dbenv, u_int32_t event_id, void * info)
+{
+	JNIEnv *jenv = __dbj_get_jnienv();
+	jobject jdbenv = (jobject)DB_ENV_INTERNAL(dbenv);
+	int ret;
+
+	COMPQUIET(info, NULL);
+
+	if(jdbenv == NULL)
+		return ;
+
+	ret = (*jenv)->CallNonvirtualIntMethod(jenv, jdbenv, dbenv_class,
+	    event_notify_method, event_id);
+
+	if((*jenv)->ExceptionOccurred(jenv)) {
+		/* The exception will be thrown, so this could be any error. */
+		ret = EINVAL;
+	}
+	return ;
+}
+
 static int __dbj_rep_transport(DB_ENV *dbenv,
     const DBT *control, const DBT *rec, const DB_LSN *lsn, int envid,
     u_int32_t flags)
@@ -95,6 +123,9 @@ static int __dbj_rep_transport(DB_ENV *dbenv,
 	jbyteArray jcontrolarr, jrecarr;
 	int ret;
 
+	if (jdbenv == NULL)
+		return (EINVAL);
+
 	jcontrol = (*jenv)->NewObject(jenv, dbt_class, dbt_construct);
 	jrec = (*jenv)->NewObject(jenv, dbt_class, dbt_construct);
 	if (jcontrol == NULL || jrec == NULL)
@@ -114,7 +145,7 @@ static int __dbj_rep_transport(DB_ENV *dbenv,
 		/* The exception will be thrown, so this could be any error. */
 		ret = EINVAL;
 	}
-	
+
 	(*jenv)->DeleteLocalRef(jenv, jrecarr);
 	(*jenv)->DeleteLocalRef(jenv, jcontrolarr);
 	(*jenv)->DeleteLocalRef(jenv, jrec);
@@ -135,18 +166,30 @@ static int __dbj_seckey_create(DB *db,
 	DBT_LOCKED lresult;
 	int ret;
 
-	jkey = (*jenv)->NewObject(jenv, dbt_class, dbt_construct);
-	jdata = (*jenv)->NewObject(jenv, dbt_class, dbt_construct);
+	if (jdb == NULL)
+		return (EINVAL);
+
+	jkey = (key->app_data != NULL) ?
+	    ((DBT_LOCKED *)key->app_data)->jdbt :
+	    (*jenv)->NewObject(jenv, dbt_class, dbt_construct);
+	jdata = (data->app_data != NULL) ?
+	    ((DBT_LOCKED *)data->app_data)->jdbt :
+	    (*jenv)->NewObject(jenv, dbt_class, dbt_construct);
 	jresult = (*jenv)->NewObject(jenv, dbt_class, dbt_construct);
 	if (jkey == NULL || jdata == NULL || jresult == NULL)
 		return (ENOMEM); /* An exception is pending */
-	
-	__dbj_dbt_copyout(jenv, key, &jkeyarr, jkey);
-	__dbj_dbt_copyout(jenv, data, &jdataarr, jdata);
 
-	if (jkeyarr == NULL || jdataarr == NULL)
-		return (ENOMEM); /* An exception is pending */
-	
+	if (key->app_data == NULL) {
+		__dbj_dbt_copyout(jenv, key, &jkeyarr, jkey);
+		if (jkeyarr == NULL)
+			return (ENOMEM); /* An exception is pending */
+	}
+	if (data->app_data == NULL) {
+		__dbj_dbt_copyout(jenv, data, &jdataarr, jdata);
+		if (jdataarr == NULL)
+			return (ENOMEM); /* An exception is pending */
+	}
+
 	ret = (int)(*jenv)->CallNonvirtualIntMethod(jenv, jdb, db_class,
 	    seckey_create_method, jkey, jdata, jresult);
 
@@ -158,24 +201,34 @@ static int __dbj_seckey_create(DB *db,
 		ret = EINVAL;
 		goto err;
 	}
-	
+
 	if ((ret = __dbj_dbt_copyin(jenv, &lresult, NULL, jresult, 0)) != 0)
 		goto err;
 
-	if (lresult.jarr != NULL) {
-		/*
-		 * If there's data, we've got a copy of it (that's the default
-		 * when no Dbt flags are set, so we can safely free the array.
-		 */
-		*result = lresult.dbt;
+	if (lresult.dbt.size != 0) {
+		/* If there's data, we need to take a copy of it.  */
+		memset(result, 0, sizeof (DBT));
+		result->size = lresult.dbt.size;
+		if ((ret =
+		    __os_umalloc(NULL, result->size, &result->data)) != 0)
+			goto err;
+		if ((ret = __dbj_dbt_memcopy(&lresult.dbt, 0,
+		    result->data, result->size,
+		    DB_USERCOPY_GETDATA)) != 0)
+			goto err;
+		__dbj_dbt_release(jenv, jresult, &lresult.dbt, &lresult);
 		(*jenv)->DeleteLocalRef(jenv, lresult.jarr);
-		result->flags |= DB_DBT_APPMALLOC;
+		F_SET(result, DB_DBT_APPMALLOC);
+	}
+
+err:	if (key->app_data == NULL) {
+		(*jenv)->DeleteLocalRef(jenv, jkeyarr);
+		(*jenv)->DeleteLocalRef(jenv, jkey);
+	}
+	if (data->app_data == NULL) {
+		(*jenv)->DeleteLocalRef(jenv, jdataarr);
+		(*jenv)->DeleteLocalRef(jenv, jdata);
 	}
-	
-err:	(*jenv)->DeleteLocalRef(jenv, jkeyarr);
-	(*jenv)->DeleteLocalRef(jenv, jkey);
-	(*jenv)->DeleteLocalRef(jenv, jdataarr);
-	(*jenv)->DeleteLocalRef(jenv, jdata);
 	(*jenv)->DeleteLocalRef(jenv, jresult);
 
 	return (ret);
@@ -190,6 +243,14 @@ static int __dbj_append_recno(DB *db, DBT *dbt, db_recno_t recno)
 	jbyteArray jdbtarr;
 	int ret;
 
+	if (jdb == NULL)
+		return (EINVAL);
+
+	/*
+	 * The dbt we're passed will be from the application, but we can't
+	 * just reuse it, since we will have already taken a copy of the data.
+	 * Make a new DatabaseEntry object here for the callback.
+	 */
 	jdbt = (*jenv)->NewObject(jenv, dbt_class, dbt_construct);
 	if (jdbt == NULL)
 		return (ENOMEM); /* An exception is pending */
@@ -200,25 +261,29 @@ static int __dbj_append_recno(DB *db, DBT *dbt, db_recno_t recno)
 
 	ret = 0;
 	(*jenv)->CallNonvirtualVoidMethod(jenv, jdb, db_class,
- 	    append_recno_method, jdbt, recno);
+	    append_recno_method, jdbt, recno);
 
 	if ((*jenv)->ExceptionOccurred(jenv)) {
 		/* The exception will be thrown, so this could be any error. */
-		ret = EINVAL;
-		goto err;
+		return (EINVAL);
 	}
 
-	if ((ret = __dbj_dbt_copyin(jenv, &lresult, NULL, jdbt, 0)) != 0)
-		goto err;
-
-	if (lresult.jarr != NULL) {
-		/*
-		 * If there's data, we've got a copy of it (that's the default
-		 * when no Dbt flags are set, so we can safely free the array.
-		 */
-		*dbt = lresult.dbt;
+	ret = __dbj_dbt_copyin(jenv, &lresult, NULL, jdbt, 0);
+	memset(dbt, 0, sizeof (DBT));
+
+	if (ret == 0 && lresult.dbt.size != 0) {
+		/* If there's data, we need to take a copy of it.  */
+		dbt->size = lresult.dbt.size;
+		if ((ret =
+		    __os_umalloc(NULL, dbt->size, &dbt->data)) != 0)
+			goto err;
+		if ((ret = __dbj_dbt_memcopy(&lresult.dbt, 0,
+		    dbt->data, dbt->size,
+		    DB_USERCOPY_GETDATA)) != 0)
+			goto err;
+		__dbj_dbt_release(jenv, jdbt, &lresult.dbt, &lresult);
 		(*jenv)->DeleteLocalRef(jenv, lresult.jarr);
-		dbt->flags |= DB_DBT_APPMALLOC;
+		F_SET(dbt, DB_DBT_APPMALLOC);
 	}
 
 err:	(*jenv)->DeleteLocalRef(jenv, jdbtarr);
@@ -234,17 +299,28 @@ static int __dbj_bt_compare(DB *db, const DBT *dbt1, const DBT *dbt2)
 	jbyteArray jdbtarr1, jdbtarr2;
 	int ret;
 
-	jdbtarr1 = (*jenv)->NewByteArray(jenv, (jsize)dbt1->size);
-        if (jdbtarr1 == NULL)
-                return ENOMEM;
-        (*jenv)->SetByteArrayRegion(jenv, jdbtarr1, 0, (jsize)dbt1->size,
-            (jbyte *)dbt1->data);
+	if (jdb == NULL)
+		return (EINVAL);
+
+	if (dbt1->app_data != NULL)
+		jdbtarr1 = ((DBT_LOCKED *)dbt1->app_data)->jarr;
+	else {
+		jdbtarr1 = (*jenv)->NewByteArray(jenv, (jsize)dbt1->size);
+		if (jdbtarr1 == NULL)
+			return (ENOMEM);
+		(*jenv)->SetByteArrayRegion(jenv, jdbtarr1, 0,
+		    (jsize)dbt1->size, (jbyte *)dbt1->data);
+	}
 
-	jdbtarr2 = (*jenv)->NewByteArray(jenv, (jsize)dbt2->size);
-        if (jdbtarr2 == NULL)
-                return ENOMEM;
-        (*jenv)->SetByteArrayRegion(jenv, jdbtarr2, 0, (jsize)dbt2->size,
-            (jbyte *)dbt2->data);
+	if (dbt2->app_data != NULL)
+		jdbtarr2 = ((DBT_LOCKED *)dbt2->app_data)->jarr;
+	else {
+		jdbtarr2 = (*jenv)->NewByteArray(jenv, (jsize)dbt2->size);
+		if (jdbtarr2 == NULL)
+			return (ENOMEM);
+		(*jenv)->SetByteArrayRegion(jenv, jdbtarr2, 0,
+		    (jsize)dbt2->size, (jbyte *)dbt2->data);
+	}
 
 	ret = (int)(*jenv)->CallNonvirtualIntMethod(jenv, jdb, db_class,
 	    bt_compare_method, jdbtarr1, jdbtarr2);
@@ -253,9 +329,11 @@ static int __dbj_bt_compare(DB *db, const DBT *dbt1, const DBT *dbt2)
 		/* The exception will be thrown, so this could be any error. */
 		ret = EINVAL;
 	}
-	
-	(*jenv)->DeleteLocalRef(jenv, jdbtarr2);
-	(*jenv)->DeleteLocalRef(jenv, jdbtarr1);
+
+	if (dbt1->app_data == NULL)
+		(*jenv)->DeleteLocalRef(jenv, jdbtarr1);
+	if (dbt2->app_data == NULL)
+		(*jenv)->DeleteLocalRef(jenv, jdbtarr2);
 
 	return (ret);
 }
@@ -268,23 +346,40 @@ static size_t __dbj_bt_prefix(DB *db, const DBT *dbt1, const DBT *dbt2)
 	jbyteArray jdbtarr1, jdbtarr2;
 	int ret;
 
-	jdbt1 = (*jenv)->NewObject(jenv, dbt_class, dbt_construct);
-	jdbt2 = (*jenv)->NewObject(jenv, dbt_class, dbt_construct);
-	if (jdbt1 == NULL || jdbt2 == NULL)
-		return ENOMEM; /* An exception is pending */
+	if (jdb == NULL)
+		return (EINVAL);
+
+	if (dbt1->app_data != NULL)
+		jdbt1 = ((DBT_LOCKED *)dbt1->app_data)->jdbt;
+	else {
+		if ((jdbt1 = (*jenv)->NewObject(jenv, dbt_class, dbt_construct)) == NULL)
+			return (ENOMEM); /* An exception is pending */
+		__dbj_dbt_copyout(jenv, dbt1, &jdbtarr1, jdbt1);
+		if (jdbtarr1 == NULL)
+			return (ENOMEM); /* An exception is pending */
+	}
+
+	if (dbt2->app_data != NULL)
+		jdbt2 = ((DBT_LOCKED *)dbt2->app_data)->jdbt;
+	else {
+		if ((jdbt2 = (*jenv)->NewObject(jenv, dbt_class, dbt_construct)) == NULL)
+			return (ENOMEM); /* An exception is pending */
+		__dbj_dbt_copyout(jenv, dbt2, &jdbtarr2, jdbt2);
+		if (jdbtarr2 == NULL)
+			return (ENOMEM); /* An exception is pending */
+	}
 
-	__dbj_dbt_copyout(jenv, dbt1, &jdbtarr1, jdbt1);
-	__dbj_dbt_copyout(jenv, dbt2, &jdbtarr2, jdbt2);
-	if (jdbtarr1 == NULL || jdbtarr2 == NULL)
-		return ENOMEM; /* An exception is pending */
-	
 	ret = (int)(*jenv)->CallNonvirtualIntMethod(jenv, jdb, db_class,
 	    bt_prefix_method, jdbt1, jdbt2);
-	
-	(*jenv)->DeleteLocalRef(jenv, jdbtarr2);
-	(*jenv)->DeleteLocalRef(jenv, jdbtarr1);
-	(*jenv)->DeleteLocalRef(jenv, jdbt2);
-	(*jenv)->DeleteLocalRef(jenv, jdbt1);
+
+	if (dbt1->app_data == NULL) {
+		(*jenv)->DeleteLocalRef(jenv, jdbtarr1);
+		(*jenv)->DeleteLocalRef(jenv, jdbt1);
+	}
+	if (dbt2->app_data == NULL) {
+		(*jenv)->DeleteLocalRef(jenv, jdbtarr2);
+		(*jenv)->DeleteLocalRef(jenv, jdbt2);
+	}
 
 	return (ret);
 }
@@ -293,32 +388,34 @@ static int __dbj_dup_compare(DB *db, const DBT *dbt1, const DBT *dbt2)
 {
 	JNIEnv *jenv = __dbj_get_jnienv();
 	jobject jdb = (jobject)DB_INTERNAL(db);
-	jobject jdbt1, jdbt2;
 	jbyteArray jdbtarr1, jdbtarr2;
 	int ret;
 
-	jdbt1 = (*jenv)->NewObject(jenv, dbt_class, dbt_construct);
-	jdbt2 = (*jenv)->NewObject(jenv, dbt_class, dbt_construct);
-	if (jdbt1 == NULL || jdbt2 == NULL)
-		return ENOMEM; /* An exception is pending */
+	if (jdb == NULL)
+		return (EINVAL);
 
-	__dbj_dbt_copyout(jenv, dbt1, &jdbtarr1, jdbt1);
-	__dbj_dbt_copyout(jenv, dbt2, &jdbtarr2, jdbt2);
-	if (jdbtarr1 == NULL || jdbtarr2 == NULL)
-		return ENOMEM; /* An exception is pending */
+	jdbtarr1 = (*jenv)->NewByteArray(jenv, (jsize)dbt1->size);
+	if (jdbtarr1 == NULL)
+		return (ENOMEM);
+	(*jenv)->SetByteArrayRegion(jenv, jdbtarr1, 0, (jsize)dbt1->size,
+	    (jbyte *)dbt1->data);
+
+	jdbtarr2 = (*jenv)->NewByteArray(jenv, (jsize)dbt2->size);
+	if (jdbtarr2 == NULL)
+		return (ENOMEM);
+	(*jenv)->SetByteArrayRegion(jenv, jdbtarr2, 0, (jsize)dbt2->size,
+	    (jbyte *)dbt2->data);
 
 	ret = (int)(*jenv)->CallNonvirtualIntMethod(jenv, jdb, db_class,
-	    dup_compare_method, jdbt1, jdbt2);
-	
+	    dup_compare_method, jdbtarr1, jdbtarr2);
+
 	if ((*jenv)->ExceptionOccurred(jenv)) {
 		/* The exception will be thrown, so this could be any error. */
 		ret = EINVAL;
 	}
-	
+
 	(*jenv)->DeleteLocalRef(jenv, jdbtarr2);
 	(*jenv)->DeleteLocalRef(jenv, jdbtarr1);
-	(*jenv)->DeleteLocalRef(jenv, jdbt2);
-	(*jenv)->DeleteLocalRef(jenv, jdbt1);
 
 	return (ret);
 }
@@ -328,8 +425,9 @@ static void __dbj_db_feedback(DB *db, int opcode, int percent)
 	JNIEnv *jenv = __dbj_get_jnienv();
 	jobject jdb = (jobject)DB_INTERNAL(db);
 
-	(*jenv)->CallNonvirtualVoidMethod(jenv, jdb, db_class,
-	    db_feedback_method, opcode, percent);
+	if (jdb != NULL)
+		(*jenv)->CallNonvirtualVoidMethod(jenv, jdb, db_class,
+		    db_feedback_method, opcode, percent);
 }
 
 static u_int32_t __dbj_h_hash(DB *db, const void *data, u_int32_t len)
@@ -339,8 +437,11 @@ static u_int32_t __dbj_h_hash(DB *db, const void *data, u_int32_t len)
 	jbyteArray jarr = (*jenv)->NewByteArray(jenv, (jsize)len);
 	int ret;
 
-	if (jarr == NULL)
-		return ENOMEM; /* An exception is pending */
+	if (jdb == NULL)
+		return (EINVAL);
+
+	if ((jarr = (*jenv)->NewByteArray(jenv, (jsize)len)) == NULL)
+		return (ENOMEM); /* An exception is pending */
 
 	(*jenv)->SetByteArrayRegion(jenv, jarr, 0, (jsize)len, (jbyte *)data);
 
@@ -353,18 +454,20 @@ static u_int32_t __dbj_h_hash(DB *db, const void *data, u_int32_t len)
 }
 %}
 
-JAVA_CALLBACK(void (*db_errcall_fcn)(const DB_ENV *, const char *, const char *),
-    com.sleepycat.db.ErrorHandler, error)
+JAVA_CALLBACK(void (*db_errcall_fcn)(const DB_ENV *,
+    const char *, const char *), com.sleepycat.db.ErrorHandler, error)
 JAVA_CALLBACK(void (*env_feedback_fcn)(DB_ENV *, int, int),
     com.sleepycat.db.FeedbackHandler, env_feedback)
 JAVA_CALLBACK(void (*db_msgcall_fcn)(const DB_ENV *, const char *),
     com.sleepycat.db.MessageHandler, message)
 JAVA_CALLBACK(void (*db_panic_fcn)(DB_ENV *, int),
     com.sleepycat.db.PanicHandler, panic)
+JAVA_CALLBACK(void (*event_notify)(DB_ENV *, u_int32_t, void *),
+    com.sleepycat.db.EventHandler, event_notify)
 JAVA_CALLBACK(int (*tx_recover)(DB_ENV *, DBT *, DB_LSN *, db_recops),
     com.sleepycat.db.LogRecordHandler, app_dispatch)
 JAVA_CALLBACK(int (*send)(DB_ENV *, const DBT *, const DBT *,
-                               const DB_LSN *, int, u_int32_t),
+			       const DB_LSN *, int, u_int32_t),
     com.sleepycat.db.ReplicationTransport, rep_transport)
 
 /*