diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-09-21 18:31:31 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-09-21 18:31:31 +0200 |
commit | edae2586a4b7927ab9a1771441f46b81b779b0dd (patch) | |
tree | f67ae66fbce79782523bc57c18324b8cfa47aac9 /container-core/src/main/java/com/yahoo/container/core | |
parent | 97535ec41f52e4c6319495ced85933ead42b0a2b (diff) |
Less defensive shutdown
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/core')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/documentapi/MessageBusDocumentAccessProvider.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/documentapi/MessageBusDocumentAccessProvider.java b/container-core/src/main/java/com/yahoo/container/core/documentapi/MessageBusDocumentAccessProvider.java index c3cd78e4da9..cd6a2fc8b12 100644 --- a/container-core/src/main/java/com/yahoo/container/core/documentapi/MessageBusDocumentAccessProvider.java +++ b/container-core/src/main/java/com/yahoo/container/core/documentapi/MessageBusDocumentAccessProvider.java @@ -33,9 +33,10 @@ public class MessageBusDocumentAccessProvider extends AbstractComponent implemen public DocumentAccess get() { synchronized (monitor) { if (access == null) { - access = new MessageBusDocumentAccess((MessageBusParams) new MessageBusParams(new LoadTypeSet(loadTypeConfig)).setDocumentmanagerConfig(documentmanagerConfig)); if (shutDown) - access.shutdown(); + throw new IllegalStateException("This document access has been shut down"); + + access = new MessageBusDocumentAccess((MessageBusParams) new MessageBusParams(new LoadTypeSet(loadTypeConfig)).setDocumentmanagerConfig(documentmanagerConfig)); } return access; } @@ -44,11 +45,9 @@ public class MessageBusDocumentAccessProvider extends AbstractComponent implemen @Override public void deconstruct() { synchronized (monitor) { - if ( ! shutDown) { - shutDown = true; - if (access != null) - access.shutdown(); - } + shutDown = true; + if (access != null) + access.shutdown(); } } |