Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-1541 Netconf device simulating testtool"
[controller.git]
/
opendaylight
/
md-sal
/
samples
/
toaster-provider
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
yang
/
config
/
toaster_provider
/
impl
/
ToasterProviderModule.java
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 388c78eaaf6365c77241c17cae04848680882624..5832e29a139a09ab393cbe3a603f9baec9d1cc14 100644
(file)
--- 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();
dataChangeListenerRegistration.close();
rpcRegistration.close();
runtimeReg.close();
-
opendaylightToaster.close(
);
+
closeQuietly(opendaylightToaster
);
log.info("Toaster provider (instance {}) torn down.", this);
}
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();
}
AutoCloseable ret = new AutoCloseableToaster();