From 73143abee34c22434479bbe20889c9ef8480cd70 Mon Sep 17 00:00:00 2001
From: "guillaume.lambert" <guillaume.lambert@orange.com>
Date: Tue, 18 Aug 2020 09:54:35 +0200
Subject: [PATCH] Migrate SH module to Aluminium

JIRA: TRNSPRTPCE-292 TRNSPRTPCE-303
Change-Id: I55c9df594ab1bec2f2de737c3a35bbec8db4e8b4
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
---
 .../servicehandler/listeners/RendererListenerImpl.java         | 3 +++
 .../transportpce/servicehandler/utils/ServiceDataUtils.java    | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java
index 8381d1d2f..533d23dc0 100644
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java
@@ -58,6 +58,9 @@ public class RendererListenerImpl implements TransportpceRendererListener {
                 case 3 :
                     if (serviceRpcResultSp.getStatus() == RpcStatusEx.Successful) {
                         LOG.info("Service implemented !");
+                        if (serviceDataStoreOperations == null) {
+                            return;
+                        }
                         OperationResult operationResult = null;
                         if (tempService) {
                             operationResult = this.serviceDataStoreOperations.modifyTempService(
diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java
index b5082392f..5f0844a8b 100644
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java
@@ -446,12 +446,10 @@ public final class ServiceDataUtils {
         AToZDirection atozDirection = new AToZDirectionBuilder()
             .setRate(azRate)
             .setAToZWavelengthNumber(azWaveLength)
-            .setAToZ(null)
             .build();
         ZToADirection ztoaDirection = new ZToADirectionBuilder()
             .setRate(zaRate)
             .setZToAWavelengthNumber(zaWaveLength)
-            .setZToA(null)
             .build();
         PathDescription pathDescription = new PathDescriptionBuilder()
             .setAToZDirection(atozDirection)
-- 
2.36.6