Bug 8982: avoid .transform() NPEs

[netvirt.git] / vpnservice / sfc / classifier / impl / src / main / java / org / opendaylight / netvirt / sfc / classifier / providers / SfcProvider.java

diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProvider.java b/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProvider.java
index 10eed0b7f467a50d2c7a05a56ff0d5d4711ff868..7a3d4a484aaff5717898b6c8c98e6cab5acaa2fe 100644 (file)
--- a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProvider.java
+++ b/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProvider.java
@@ -48,7 +48,7 @@ public class SfcProvider {
                 .child(RenderedServicePath.class, renderedServicePathKey).build();
 
 
-        return Optional.ofNullable(MDSALUtil.read(dataBroker, LogicalDatastoreType.OPERATIONAL, rspIid).orNull());
+        return MDSALUtil.read(dataBroker, LogicalDatastoreType.OPERATIONAL, rspIid).toJavaUtil();
     }
 
     public Optional<RenderedServicePath> getRenderedServicePathFromSfc(String sfcName) {
@@ -105,7 +105,7 @@ public class SfcProvider {
         InstanceIdentifier<ServiceFunction> sfIid = InstanceIdentifier.builder(ServiceFunctions.class)
                 .child(ServiceFunction.class, serviceFunctionKey).build();
 
-        return Optional.ofNullable(MDSALUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION, sfIid).orNull());
+        return MDSALUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION, sfIid).toJavaUtil();
     }
 
     private Optional<RenderedServicePathHop> getRspFirstHop(RenderedServicePath rsp) {