]> granicus.if.org Git - php/commitdiff
@- Fixed warning when shutting down OCINLogon() connections. (Thies)
authorThies C. Arntzen <thies@php.net>
Sat, 5 Aug 2000 10:45:55 +0000 (10:45 +0000)
committerThies C. Arntzen <thies@php.net>
Sat, 5 Aug 2000 10:45:55 +0000 (10:45 +0000)
ext/oci8/oci8.c

index 739da224e73cbc7ef221b9fc83bc80674660abef..f550fc94ab32744694bfcdee347d2ab740b2afc9 100644 (file)
@@ -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 */