From 9afe1e0d4f938af269667f7c267ea52e05817659 Mon Sep 17 00:00:00 2001 From: Sharon Aicler Date: Thu, 18 Sep 2014 15:58:22 -0700 Subject: [PATCH] Bug#1955 - Avoid the bug condition in XSQL Change-Id: I15c8c409ca6bc9aa7c147cdaaa7deca6e640bdcc Signed-off-by: Sharon Aicler --- .../org/opendaylight/xsql/XSQLProvider.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/xsql/XSQLProvider.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/xsql/XSQLProvider.java index b421e56cf4..cde01573f2 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/xsql/XSQLProvider.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/xsql/XSQLProvider.java @@ -1,7 +1,5 @@ package org.opendaylight.xsql; -import java.util.concurrent.ExecutionException; - import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; import org.opendaylight.controller.sal.binding.api.data.DataProviderService; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.xsql.rev140626.XSQL; @@ -25,16 +23,15 @@ public class XSQLProvider implements AutoCloseable { XSQLBuilder builder = new XSQLBuilder(); builder.setPort("34343"); XSQL xsql = builder.build(); - if (dps != null) { - final DataModificationTransaction t = dps.beginTransaction(); - t.removeOperationalData(ID); - t.putOperationalData(ID,xsql); - - try { + try { + if (dps != null) { + final DataModificationTransaction t = dps.beginTransaction(); + t.removeOperationalData(ID); + t.putOperationalData(ID,xsql); t.commit().get(); - } catch (InterruptedException | ExecutionException e) { - LOG.warn("Failed to update toaster status, operational otherwise", e); } + } catch (Exception e) { + LOG.warn("Failed to update XSQL port status, ", e); } return xsql; } -- 2.36.6