From a2182c46ff299368e784a3ad6bdfa8d48e177193 Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Mon, 29 Jan 2007 14:44:37 +0000 Subject: [PATCH] Fix rollback of transaction. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@24428 72102866-910b-0410-8b05-ffd578937521 --- JDBC.m | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/JDBC.m b/JDBC.m index 793e433..729fc2d 100644 --- a/JDBC.m +++ b/JDBC.m @@ -938,21 +938,16 @@ static int JDBCVARCHAR = 0; /* Get the new connection object */ -#if 0 - jo = (*env)->CallStaticObjectMethod(env, jc, jm, - JStringFromNSString(env, url), - JStringFromNSString(env, [self user]), - JStringFromNSString(env, [self password])); -#else -jobject js1 = JStringFromNSString(env, url); -jobject js2 = JStringFromNSString(env, [self user]); -jobject js3 = JStringFromNSString(env, [self password]); -NSLog(@"CONNECT '%@', '%@', '%@'", - NSStringFromJString(env, js1), - NSStringFromJString(env, js2), - NSStringFromJString(env, js3)); + jobject js1 = JStringFromNSString(env, url); + jobject js2 = JStringFromNSString(env, [self user]); + jobject js3 = JStringFromNSString(env, [self password]); +/* + NSLog(@"CONNECT '%@', '%@', '%@'", + NSStringFromJString(env, js1), + NSStringFromJString(env, js2), + NSStringFromJString(env, js3)); + */ jo = (*env)->CallStaticObjectMethod(env, jc, jm, js1, js2, js3); -#endif if (jo == 0) { JExceptionClear (env); @@ -1798,7 +1793,7 @@ static id marker = @"End of statement data"; { if (wrapped == YES) { - (*env)->CallVoidMethod (env, ji->connection, ji->commit); + (*env)->CallVoidMethod (env, ji->connection, ji->rollback); JException(env); } (*env)->PopLocalFrame (env, NULL);