SH slight clean-up after Ca bump

[transportpce.git] / servicehandler / src / main / java / org / opendaylight / transportpce / servicehandler / impl / ServiceDeleteImpl.java

diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceDeleteImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceDeleteImpl.java
index 6bdd8a229171e677a2cac7084ad4f31a63e0fcbf..1bb9d53f99b9c6011c0da39215d9493edd57db4f 100644 (file)
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceDeleteImpl.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceDeleteImpl.java
@@ -82,14 +82,12 @@ public class ServiceDeleteImpl implements ServiceDelete {
         }
         //Check presence of service to be deleted
         Optional<Services> serviceOpt = this.serviceDataStoreOperations.getService(serviceName);
-        Services service;
         if (serviceOpt.isEmpty()) {
             LOG.warn(SERVICE_DELETE_MSG, LogMessages.serviceNotInDS(serviceName));
             return ModelMappingUtils.createDeleteServiceReply(
                     input, ResponseCodes.FINAL_ACK_YES,
                     LogMessages.serviceNotInDS(serviceName), ResponseCodes.RESPONSE_FAILED);
         }
-        service = serviceOpt.orElseThrow();
         LOG.debug("serviceDelete: Service '{}' found in datastore", serviceName);
         this.pceListener.setInput(new ServiceInput(input));
         this.pceListener.setServiceReconfigure(false);
@@ -101,6 +99,7 @@ public class ServiceDeleteImpl implements ServiceDelete {
         this.networkListener.setserviceDataStoreOperations(serviceDataStoreOperations);
         org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteInput
                 serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput(new ServiceInput(input));
+        Services service = serviceOpt.orElseThrow();
         org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteOutput output =
             this.rendererServiceWrapper.performRenderer(
                 serviceDeleteInput, ServiceNotificationTypes.ServiceDeleteResult, service);