aboutsummaryrefslogtreecommitdiffstats
path: root/jdisc_core
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-05-30 11:39:26 +0200
committerJon Bratseth <bratseth@oath.com>2018-05-30 11:39:26 +0200
commit4919fb84be7edc03f7c7feb0080ff0c5f705f654 (patch)
tree4eb3d1a1032c6a329b05acc05af4acc4eb0594e8 /jdisc_core
parent9bfecc00be5716933ec305aa9161f68c4dca4200 (diff)
Run reconfigurer thread even when restartOnRedeploy is true
Diffstat (limited to 'jdisc_core')
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerActivator.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerActivator.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerActivator.java
index 9d1b613e23c..59db453e2c4 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerActivator.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerActivator.java
@@ -13,27 +13,28 @@ import com.yahoo.jdisc.Container;
* #newContainerBuilder()}, 2) configure the returned {@link ContainerBuilder}, and 3) pass the builder to the {@link
* #activateContainer(ContainerBuilder)} method.</p>
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
*/
public interface ContainerActivator {
/**
- * <p>This method creates and returns a new {@link ContainerBuilder} object that has the necessary references to the
- * application and its internal components.</p>
+ * This method creates and returns a new {@link ContainerBuilder} object that has the necessary references to the
+ * application and its internal components.
*
* @return The created builder.
*/
- public ContainerBuilder newContainerBuilder();
+ ContainerBuilder newContainerBuilder();
/**
- * <p>Creates and activates a {@link Container} based on the provided {@link ContainerBuilder}. By providing a
+ * Creates and activates a {@link Container} based on the provided {@link ContainerBuilder}. By providing a
* <em>null</em> argument, this method can be used to deactivate the current Container. The returned object can be
- * used to schedule a cleanup task that is executed once the the deactivated Container has terminated.</p>
+ * used to schedule a cleanup task that is executed once the the deactivated Container has terminated.
*
* @param builder The builder to activate.
* @return The previous container, if any.
* @throws ApplicationNotReadyException If this method is called before {@link Application#start()} or after {@link
* Application#stop()}.
*/
- public DeactivatedContainer activateContainer(ContainerBuilder builder);
+ DeactivatedContainer activateContainer(ContainerBuilder builder);
+
}