Check for null certManager

Change-Id: I9fe1e32267f147f67cdd07f02ad26c069641c33f
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java
index 9fb188422975b158a2b7b1855cc20ac12461f38b..18c65e4c8d5978b53ae4ece76ff214397eead321 100644 (file)
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java
@@ -150,8 +150,8 @@ public class OvsdbConnectionService implements AutoCloseable, OvsdbConnection {
             bootstrap.handler(new ChannelInitializer<SocketChannel>() {
                 @Override
                 public void initChannel(SocketChannel channel) throws Exception {
-                    SSLContext sslContext = certificateManagerSrv.getServerContext();
-                    if (sslContext != null) {
+                    if (certificateManagerSrv != null && certificateManagerSrv.getServerContext() != null) {
+                        SSLContext sslContext = certificateManagerSrv.getServerContext();
                         /* First add ssl handler if ssl context is given */
                         SSLEngine engine =
                             sslContext.createSSLEngine(address.toString(), port);
@@ -318,9 +318,9 @@ public class OvsdbConnectionService implements AutoCloseable, OvsdbConnection {
                         @Override
                         public void initChannel(SocketChannel channel) throws Exception {
                             LOG.debug("New Passive channel created : {}", channel);
-                            SSLContext sslContext = certificateManagerSrv.getServerContext();
-                            if (sslContext != null) {
+                            if (certificateManagerSrv != null && certificateManagerSrv.getServerContext() != null) {
                                 /* Add SSL handler first if SSL context is provided */
+                                SSLContext sslContext = certificateManagerSrv.getServerContext();
                                 SSLEngine engine = sslContext.createSSLEngine();
                                 engine.setUseClientMode(false); // work in a server mode
                                 engine.setNeedClientAuth(true); // need client authentication