mirror of
https://github.com/gnustep/libs-sqlclient.git
synced 2025-02-19 01:50:49 +00:00
Fix rollback of transaction.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@24428 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
fc46f3a865
commit
a2182c46ff
1 changed files with 10 additions and 15 deletions
11
JDBC.m
11
JDBC.m
|
@ -938,21 +938,16 @@ static int JDBCVARCHAR = 0;
|
||||||
|
|
||||||
/* Get the new connection object
|
/* 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 js1 = JStringFromNSString(env, url);
|
||||||
jobject js2 = JStringFromNSString(env, [self user]);
|
jobject js2 = JStringFromNSString(env, [self user]);
|
||||||
jobject js3 = JStringFromNSString(env, [self password]);
|
jobject js3 = JStringFromNSString(env, [self password]);
|
||||||
|
/*
|
||||||
NSLog(@"CONNECT '%@', '%@', '%@'",
|
NSLog(@"CONNECT '%@', '%@', '%@'",
|
||||||
NSStringFromJString(env, js1),
|
NSStringFromJString(env, js1),
|
||||||
NSStringFromJString(env, js2),
|
NSStringFromJString(env, js2),
|
||||||
NSStringFromJString(env, js3));
|
NSStringFromJString(env, js3));
|
||||||
|
*/
|
||||||
jo = (*env)->CallStaticObjectMethod(env, jc, jm, js1, js2, js3);
|
jo = (*env)->CallStaticObjectMethod(env, jc, jm, js1, js2, js3);
|
||||||
#endif
|
|
||||||
if (jo == 0)
|
if (jo == 0)
|
||||||
{
|
{
|
||||||
JExceptionClear (env);
|
JExceptionClear (env);
|
||||||
|
@ -1798,7 +1793,7 @@ static id marker = @"End of statement data";
|
||||||
{
|
{
|
||||||
if (wrapped == YES)
|
if (wrapped == YES)
|
||||||
{
|
{
|
||||||
(*env)->CallVoidMethod (env, ji->connection, ji->commit);
|
(*env)->CallVoidMethod (env, ji->connection, ji->rollback);
|
||||||
JException(env);
|
JException(env);
|
||||||
}
|
}
|
||||||
(*env)->PopLocalFrame (env, NULL);
|
(*env)->PopLocalFrame (env, NULL);
|
||||||
|
|
Loading…
Reference in a new issue