From f78d6fdc6392b8cedb53839512480d84a63c96b4 Mon Sep 17 00:00:00 2001
From: Gilles Thouenon <gilles.thouenon@orange.com>
Date: Thu, 16 Dec 2021 15:46:10 +0100
Subject: [PATCH] Fix few NPE in TAPI implementation

JIRA: TRNSPRTPCE-581
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: Iae4a6b32bbe104ce62f04271fd562aacd3b12a41
---
 .../tapi/listeners/TapiRendererListenerImpl.java            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiRendererListenerImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiRendererListenerImpl.java
index 81c0c9c5f..24d5e3097 100644
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiRendererListenerImpl.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiRendererListenerImpl.java
@@ -71,7 +71,9 @@ public class TapiRendererListenerImpl implements TransportpceRendererListener {
     private void onServiceImplementationResult(RendererRpcResultSp notification) {
         switch (serviceRpcResultSp.getStatus()) {
             case Successful:
-                onSuccededServiceImplementation();
+                if (this.serviceUuid != null) {
+                    onSuccededServiceImplementation();
+                }
                 break;
             case Failed:
                 onFailedServiceImplementation(notification.getServiceName());
@@ -103,7 +105,7 @@ public class TapiRendererListenerImpl implements TransportpceRendererListener {
             .setLifecycleState(LifecycleState.INSTALLED)
             .setOperationalState(OperationalState.ENABLED)
             .build();
-        for (Connection connection:updtConnServ.getConnection().values()) {
+        for (Connection connection:updtConnServ.nonnullConnection().values()) {
             updateConnectionState(connection.getConnectionUuid());
         }
         updateConnectivityService(updtConnServ);
-- 
2.36.6