Use simple returns instead of overwriting a local variable.
Change-Id: I886590ddcfc5b15c69a6f63953eaffdce5348dc8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
@SuppressWarnings("IllegalCatch")
public Optional<Node> getBridgeNode(InstanceIdentifier<?> iid) {
InstanceIdentifier<Node> nodeIid = iid.firstIdentifierOf(Node.class);
@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()) {
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);
} catch (Exception exp) {
LOG.error("Error in getting the brideNode for {}", iid, exp);
+ return Optional.empty();
}
public Optional<OvsdbBridgeAugmentation> getOvsdbBridgeAugmentation(InstanceIdentifier<?> iid) {
}
public Optional<OvsdbBridgeAugmentation> getOvsdbBridgeAugmentation(InstanceIdentifier<?> iid) {