diff options
Diffstat (limited to 'storage/connect/javaconn.cpp')
| -rw-r--r-- | storage/connect/javaconn.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/storage/connect/javaconn.cpp b/storage/connect/javaconn.cpp index 9fc44c5cbfe..3ba99ed89f8 100644 --- a/storage/connect/javaconn.cpp +++ b/storage/connect/javaconn.cpp @@ -124,6 +124,7 @@ JAVAConn::JAVAConn(PGLOBAL g, PCSZ wrapper) m_Wrap = strcat(strcpy(wn, "wrappers/"), m_Wrap); } // endif m_Wrap + fp = NULL; m_Opened = false; m_Connected = false; m_Rows = 0; @@ -567,6 +568,24 @@ bool JAVAConn::Open(PGLOBAL g) return true; } // endif Check + /*********************************************************************/ + /* Link a Fblock. This make possible to automatically close it */ + /* in case of error (throw). */ + /*********************************************************************/ + PDBUSER dbuserp = (PDBUSER)g->Activityp->Aptr; + + fp = (PFBLOCK)PlugSubAlloc(g, NULL, sizeof(FBLOCK)); + fp->Type = TYPE_FB_JAVA; + fp->Fname = NULL; + fp->Next = dbuserp->Openlist; + dbuserp->Openlist = fp; + fp->Count = 1; + fp->Length = 0; + fp->Memory = NULL; + fp->Mode = MODE_ANY; + fp->File = this; + fp->Handle = 0; + m_Opened = true; return false; } // end of Open @@ -595,5 +614,8 @@ void JAVAConn::Close() if ((rc = jvm->DetachCurrentThread()) != JNI_OK) printf("DetachCurrentThread: rc=%d\n", (int)rc); + if (fp) + fp->Count = 0; + m_Opened = false; } // end of Close |