X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Foracle.c;h=7a8ccc6bf5b7ae3479743a86d945086b086fb9d0;hb=ab9fd6d9336a623b7feb73e284cbd072496de102;hp=49cf657123b303c4dc292f55dff63a37b02e0dff;hpb=72fefab2a6bf8111fb68816a1c1da30afa5c2d92;p=collectd.git

diff --git a/src/oracle.c b/src/oracle.c
index 49cf6571..7a8ccc6b 100644
--- a/src/oracle.c
+++ b/src/oracle.c
@@ -612,16 +612,22 @@ static int o_read_database (o_database_t *db) /* {{{ */
       o_report_error ("o_read_database", "OCIAttrGet", oci_error);
       return (-1);
     }
-    assert (server_handle != NULL);
 
-    connection_status = 0;
-    status = OCIAttrGet ((void *) server_handle, OCI_HTYPE_SERVER,
-        (void *) &connection_status, /* size pointer = */ NULL,
-        OCI_ATTR_SERVER_STATUS, oci_error);
-    if (status != OCI_SUCCESS)
+    if (server_handle == NULL)
     {
-      o_report_error ("o_read_database", "OCIAttrGet", oci_error);
-      return (-1);
+      connection_status = OCI_SERVER_NOT_CONNECTED;
+    }
+    else /* if (server_handle != NULL) */
+    {
+      connection_status = 0;
+      status = OCIAttrGet ((void *) server_handle, OCI_HTYPE_SERVER,
+          (void *) &connection_status, /* size pointer = */ NULL,
+          OCI_ATTR_SERVER_STATUS, oci_error);
+      if (status != OCI_SUCCESS)
+      {
+        o_report_error ("o_read_database", "OCIAttrGet", oci_error);
+        return (-1);
+      }
     }
 
     if (connection_status != OCI_SERVER_NORMAL)