Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Propagate TimeoutException when ActorSystem fails to terminate
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
akka
/
impl
/
ActorSystemProviderImpl.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/ActorSystemProviderImpl.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/ActorSystemProviderImpl.java
index 0d43250f5d42c2c67370f8e83d01f3aeaa82bb9f..6e805b33d7893045b431f3314cd18525a3bce5e4 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/ActorSystemProviderImpl.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/ActorSystemProviderImpl.java
@@
-11,6
+11,7
@@
import akka.actor.ActorSystem;
import akka.actor.Props;
import com.typesafe.config.Config;
import java.util.concurrent.TimeUnit;
import akka.actor.Props;
import com.typesafe.config.Config;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import org.opendaylight.controller.cluster.ActorSystemProvider;
import org.opendaylight.controller.cluster.ActorSystemProviderListener;
import org.opendaylight.controller.cluster.common.actor.QuarantinedMonitorActor;
import org.opendaylight.controller.cluster.ActorSystemProvider;
import org.opendaylight.controller.cluster.ActorSystemProviderListener;
import org.opendaylight.controller.cluster.common.actor.QuarantinedMonitorActor;
@@
-51,14
+52,8
@@
public class ActorSystemProviderImpl implements ActorSystemProvider, AutoCloseab
}
@Override
}
@Override
- @SuppressWarnings("checkstyle:IllegalCatch")
- public void close() {
+ public void close() throws TimeoutException, InterruptedException {
LOG.info("Shutting down ActorSystem");
LOG.info("Shutting down ActorSystem");
-
- try {
- Await.result(actorSystem.terminate(), FiniteDuration.create(10, TimeUnit.SECONDS));
- } catch (final Exception e) {
- LOG.warn("Error awaiting actor termination", e);
- }
+ Await.result(actorSystem.terminate(), FiniteDuration.create(10, TimeUnit.SECONDS));
}
}
}
}