Simplify getBridgeNode()

Use simple returns instead of overwriting a local variable.

Change-Id: I886590ddcfc5b15c69a6f63953eaffdce5348dc8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalState.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalState.java
index 2c3703006bc40936a85f8c1db5db315934c7d92e..c04d4a2fb13512e1fd8b2a59eb27487de86bc393 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalState.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalState.java
@@ -42,13 +42,12 @@ public class BridgeOperationalState {
     @SuppressWarnings("IllegalCatch")
     public Optional<Node> getBridgeNode(InstanceIdentifier<?> iid) {
         InstanceIdentifier<Node> nodeIid = iid.firstIdentifierOf(Node.class);
-        Optional<Node> bridgeNode = Optional.empty();
         try (ReadTransaction transaction = db.newReadOnlyTransaction()) {
-            bridgeNode = SouthboundUtil.readNode(transaction, nodeIid);
+            return SouthboundUtil.readNode(transaction, nodeIid);
         } catch (Exception exp) {
             LOG.error("Error in getting the brideNode for {}", iid, exp);
+            return Optional.empty();
         }
-        return bridgeNode;
     }
 
     public Optional<OvsdbBridgeAugmentation> getOvsdbBridgeAugmentation(InstanceIdentifier<?> iid) {