apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r372441 - /apr/apr-util/branches/1.2.x/dbd/apr_dbd.c
Date Thu, 26 Jan 2006 05:07:43 GMT
Author: rooneg
Date: Wed Jan 25 21:07:42 2006
New Revision: 372441

URL: http://svn.apache.org/viewcvs?rev=372441&view=rev
Log:
Merge r344144 into 1.2.x.

Original log message:

Don't break if check_conn is NOTIMPL in a driver

Modified:
    apr/apr-util/branches/1.2.x/dbd/apr_dbd.c

Modified: apr/apr-util/branches/1.2.x/dbd/apr_dbd.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.2.x/dbd/apr_dbd.c?rev=372441&r1=372440&r2=372441&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/dbd/apr_dbd.c (original)
+++ apr/apr-util/branches/1.2.x/dbd/apr_dbd.c Wed Jan 25 21:07:42 2006
@@ -143,12 +143,13 @@
                                        apr_pool_t *pool, const char *params,
                                        apr_dbd_t **handle)
 {
-
+    apr_status_t rv;
     *handle = driver->open(pool, params);
     if (*handle == NULL) {
         return APR_EGENERAL;
     }
-    if (apr_dbd_check_conn(driver, pool, *handle) != APR_SUCCESS) {
+    rv = apr_dbd_check_conn(driver, pool, *handle);
+    if ((rv != APR_SUCCESS) && (rv != APR_ENOTIMPL)) {
         apr_dbd_close(driver, *handle);
         return APR_EGENERAL;
     }



Mime
View raw message