X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=applications%2Fforwardingrules-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fapplications%2Ffrm%2Fimpl%2FBundleFlowForwarder.java;h=37ec48bf9dfd7ea485bb8730e81ad938af31ed59;hb=38f326861531f68cb5aa48cc2b1fbdcc2d75885c;hp=93ddbb3bd4b5e0f8725029d3308ca14bd06d7de8;hpb=138814a9ab5c6d8a7c7b1f5cd89c2c23a526f967;p=openflowplugin.git

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java
index 93ddbb3bd4..37ec48bf9d 100644
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java
@@ -164,14 +164,16 @@ public class BundleFlowForwarder implements BundleMessagesCommiter<Flow> {
                 InstanceIdentifier<Group> groupIdent = buildGroupInstanceIdentifier(nodeIdent, groupId);
                 LOG.info("Reading the group from config inventory: {}", groupId);
                 try (ReadTransaction readTransaction = forwardingRulesManager.getReadTransaction()) {
-                    Optional<Group> group = readTransaction.read(LogicalDatastoreType.CONFIGURATION, groupIdent).get();
-                    if (group.isPresent()) {
-                        final AddGroupInputBuilder builder = new AddGroupInputBuilder(group.get());
+                    Optional<Group> optGroup = readTransaction.read(LogicalDatastoreType.CONFIGURATION, groupIdent)
+                        .get();
+                    if (optGroup.isPresent()) {
+                        final Group group = optGroup.orElseThrow();
+                        final AddGroupInputBuilder builder = new AddGroupInputBuilder(group);
                         builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class)));
                         builder.setGroupRef(new GroupRef(nodeIdent));
                         builder.setTransactionUri(new Uri(forwardingRulesManager.getNewTransactionId()));
                         BundleInnerMessage bundleInnerMessage = new BundleAddGroupCaseBuilder()
-                                .setAddGroupCaseData(new AddGroupCaseDataBuilder(group.get()).build()).build();
+                                .setAddGroupCaseData(new AddGroupCaseDataBuilder(group).build()).build();
                         Message groupMessage = new MessageBuilder()
                                 .setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class)))
                                 .setBundleInnerMessage(bundleInnerMessage)