commit b9ea52d0229f69e70aa5543bd5a1521fca71796e
author MOURAD Rabih <rmourad@murex.com> Thu Nov 21 12:53:57 2019 +0100
committer Andrew Stitcher <astitcher@apache.org> Fri Nov 22 13:34:27 2019 -0500
tree d51ee49e03bbcec3030c3231aaa4c9bc330b2de2
parent add5ed2c4675d8138998ed421ba358731b729fc3

PROTON-2137: Removing ssl init from ssl_server_options default constructor

cpp/src/connection_options.cpp

diff --git a/cpp/src/connection_options.cpp b/cpp/src/connection_options.cpp
index 2bf281d..4e2bb3e 100644
--- a/cpp/src/connection_options.cpp
+++ b/cpp/src/connection_options.cpp
@@ -175,7 +175,8 @@
             }
         } else if (!client && ssl_server_options.set) {
             pn_ssl_t *ssl = pn_ssl(pnt);
-            if (pn_ssl_init(ssl, ssl_server_options.value.impl_->pn_domain(), NULL)) {
+            pn_ssl_domain_t* ssl_domain = ssl_server_options.value.impl_ ? ssl_server_options.value.impl_->pn_domain() : pn_ssl_domain(PN_SSL_MODE_SERVER);
+            if (pn_ssl_init(ssl, ssl_domain, NULL)) {
                 throw error(MSG("server SSL/TLS initialization error"));
             }
         }

cpp/src/ssl_options.cpp

diff --git a/cpp/src/ssl_options.cpp b/cpp/src/ssl_options.cpp
index bd4d5c1..f74f014 100644
--- a/cpp/src/ssl_options.cpp
+++ b/cpp/src/ssl_options.cpp
@@ -99,7 +99,7 @@
         throw error(MSG("SSL server configuration failure requiring client certificates using " << db));
 }
 
-ssl_server_options::ssl_server_options() : impl_(new impl) {}
+ssl_server_options::ssl_server_options() : impl_(0) {}
 
 ssl_client_options::ssl_client_options(const ssl_client_options& x): impl_(x.impl_) {
     if (impl_) impl_->incref();