From 6101526743c64e19fbf172bfd37f607fdd2481bf Mon Sep 17 00:00:00 2001 From: Emmanuel Raviart Date: Thu, 22 Jul 2004 19:35:43 +0000 Subject: Corrected Java non-regression test bug (found with Sun non free jdk :-/ ). Improved some .cvsignore. --- java/.cvsignore | 1 + java/src/c/com_entrouvert_lasso_LassoLogin.c | 8 +++++--- java/tests/LoginTest.java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'java') diff --git a/java/.cvsignore b/java/.cvsignore index 71fd50ea..6db5b856 100644 --- a/java/.cvsignore +++ b/java/.cvsignore @@ -1 +1,2 @@ _usr_share_kaffe_Klasses_jar.h +target diff --git a/java/src/c/com_entrouvert_lasso_LassoLogin.c b/java/src/c/com_entrouvert_lasso_LassoLogin.c index 03cd9161..fca7d90f 100644 --- a/java/src/c/com_entrouvert_lasso_LassoLogin.c +++ b/java/src/c/com_entrouvert_lasso_LassoLogin.c @@ -142,12 +142,14 @@ JNIEXPORT jint JNICALL Java_com_entrouvert_lasso_LassoLogin_createUser int result; char *userDump; - userDump = (char*)(*env)->GetStringUTFChars(env, _userDump, NULL); + if (_userDump) + userDump = (char*)(*env)->GetStringUTFChars(env, _userDump, NULL); login = getCObject(env, this); - result = lasso_login_init_create_user(login, userDump); + result = lasso_login_create_user(login, userDump); - (*env)->ReleaseStringUTFChars(env, _userDump, userDump); + if (_userDump) + (*env)->ReleaseStringUTFChars(env, _userDump, userDump); return result; } diff --git a/java/tests/LoginTest.java b/java/tests/LoginTest.java index 0aa18cfe..182d8c17 100644 --- a/java/tests/LoginTest.java +++ b/java/tests/LoginTest.java @@ -119,7 +119,7 @@ public class LoginTest extends TestCase { assertEquals(idpLoginContext.buildArtifactMsg( userAuthenticated, authenticationMethod, "FIXME: reauthenticateOnOrAfter", Lasso.httpMethodRedirect), 0); - idpUserContextDump = spLoginContext.getUser().dump(); + idpUserContextDump = idpLoginContext.getUser().dump(); assertNotNull(idpUserContextDump); responseUrl = idpLoginContext.getMsgUrl(); responseQuery = responseUrl.substring(responseUrl.indexOf("?") + 1); -- cgit