Reliable result for connection::option() when returning a null value.

[yazpp-moved-to-github.git] / zoom / zconn.cpp

diff --git a/zoom/zconn.cpp b/zoom/zconn.cpp
index 17773c8..4c1c7a6 100644 (file)
--- a/zoom/zconn.cpp
+++ b/zoom/zconn.cpp
@@ -1,4 +1,4 @@
-// $Header: /home/cvsroot/yaz++/zoom/zconn.cpp,v 1.5 2003-07-02 10:25:13 adam Exp $
+// $Header: /home/cvsroot/yaz++/zoom/zconn.cpp,v 1.7 2005-05-03 16:21:16 mike Exp $
 
 // Z39.50 Connection class
 
@@ -17,12 +17,14 @@ namespace ZOOM {
        const char *addinfo;
        if ((errcode = ZOOM_connection_error(c, &errmsg, &addinfo)) != 0) {
            //###cerr << "oops: no connect, errcode=" << errcode << "\n";
+           ZOOM_connection_destroy(c);
            throw bib1Exception(errcode, addinfo);
        }
     }
 
     std::string connection::option(const std::string &key) const {
-       return ZOOM_connection_option_get(c, key.c_str());
+       const char* val = ZOOM_connection_option_get(c, key.c_str());
+       return (val) ? val : std::string();
     }
 
     bool connection::option(const std::string &key, const std::string &val) {