From: Thies C. Arntzen <thies@php.net>
Date: Sat, 5 Aug 2000 10:45:55 +0000 (+0000)
Subject: @- Fixed warning when shutting down OCINLogon() connections. (Thies)
X-Git-Tag: PRE_FILE_COMPILE_API_CHANGE~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53defde3e2917dc3b23ef86249d8c436f80ed51f;p=php

@- Fixed warning when shutting down OCINLogon() connections. (Thies)
---

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 739da224e7..f550fc94ab 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -644,12 +644,6 @@ _oci_conn_list_dtor(oci_connection *connection)
 
 	oci_debug("START _oci_conn_list_dtor: id=%d",connection->id);
 
-	if (connection->session && connection->session->exclusive) {
-		/* exclusive connection created via OCINLogon() close their 
-		   associated session when destructed */
-		zend_list_delete(connection->session->num);
-	}
-
 	if (connection->pServiceContext) {
 		connection->error =
 			OCITransRollback(connection->pServiceContext,
@@ -663,6 +657,12 @@ _oci_conn_list_dtor(oci_connection *connection)
 		OCIHandleFree((dvoid *) connection->pServiceContext, (ub4) OCI_HTYPE_SVCCTX);
 	}
 
+	if (connection->session && connection->session->exclusive) {
+		/* exclusive connection created via OCINLogon() close their 
+		   associated session when destructed */
+		zend_list_delete(connection->session->num);
+	}
+
 	if (connection->pError) {
 		OCIHandleFree((dvoid *) connection->pError, (ub4) OCI_HTYPE_ERROR);
 	}
@@ -1971,7 +1971,7 @@ _oci_close_session(oci_session *session)
 		return;
 	}
 
-	oci_debug("_oci_close_session: logging-off sess=%d",session->num);
+	oci_debug("START _oci_close_session: logging-off sess=%d",session->num);
 
 	if (session->open) {
 		/* Temporary Service Context */