From da08d5903a40d67c69b12bc5abedcdcb4050f4d9 Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Mon, 18 Aug 2014 10:27:36 +0200 Subject: [PATCH] BUG-1535 Ignore exception on toaster.close It tries to delete data from store, but if the broker gets closed it cannot remove data since the broker throws exception Change-Id: I49bbbe410b9f1cb67711974c27f0375dc15c17dc Signed-off-by: Maros Marsalek --- .../toaster_provider/impl/ToasterProviderModule.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/config/yang/config/toaster_provider/impl/ToasterProviderModule.java b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/config/yang/config/toaster_provider/impl/ToasterProviderModule.java index 388c78eaaf..5832e29a13 100644 --- a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/config/yang/config/toaster_provider/impl/ToasterProviderModule.java +++ b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/config/yang/config/toaster_provider/impl/ToasterProviderModule.java @@ -76,9 +76,17 @@ public final class ToasterProviderModule extends dataChangeListenerRegistration.close(); rpcRegistration.close(); runtimeReg.close(); - opendaylightToaster.close(); + closeQuietly(opendaylightToaster); log.info("Toaster provider (instance {}) torn down.", this); } + + private void closeQuietly(final AutoCloseable resource) { + try { + resource.close(); + } catch (final Exception e) { + log.debug("Ignoring exception while closing {}", resource, e); + } + } } AutoCloseable ret = new AutoCloseableToaster(); -- 2.36.6