This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new b8c2efc6d0 Revert "Add FAILED_INIT lifecycle state"
b8c2efc6d0 is described below
commit b8c2efc6d0a5f7a80f82b2211f8f248a8d16dca2
Author: remm <r...@apache.org>
AuthorDate: Wed Oct 30 09:27:36 2024 +0100
Revert "Add FAILED_INIT lifecycle state"
This reverts commit 8d46615fdd248483e8f10cc6cd130839c429d508.
---
java/org/apache/catalina/LifecycleState.java | 3 +--
java/org/apache/catalina/util/LifecycleBase.java | 23 +++++------------------
webapps/docs/changelog.xml | 6 ------
3 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/java/org/apache/catalina/LifecycleState.java
b/java/org/apache/catalina/LifecycleState.java
index cc9a91005f..ec0fd2d10e 100644
--- a/java/org/apache/catalina/LifecycleState.java
+++ b/java/org/apache/catalina/LifecycleState.java
@@ -32,8 +32,7 @@ public enum LifecycleState {
STOPPED(false, Lifecycle.AFTER_STOP_EVENT),
DESTROYING(false, Lifecycle.BEFORE_DESTROY_EVENT),
DESTROYED(false, Lifecycle.AFTER_DESTROY_EVENT),
- FAILED(false, null),
- FAILED_INIT(false, null);
+ FAILED(false, null);
private final boolean available;
private final String lifecycleEvent;
diff --git a/java/org/apache/catalina/util/LifecycleBase.java
b/java/org/apache/catalina/util/LifecycleBase.java
index 075a349a1a..ec7abb1b22 100644
--- a/java/org/apache/catalina/util/LifecycleBase.java
+++ b/java/org/apache/catalina/util/LifecycleBase.java
@@ -153,14 +153,9 @@ public abstract class LifecycleBase implements Lifecycle {
if (state.equals(LifecycleState.NEW)) {
init();
- }
- if (state.equals(LifecycleState.FAILED)) {
+ } else if (state.equals(LifecycleState.FAILED)) {
stop();
- } else if (state.equals(LifecycleState.FAILED_INIT)) {
- destroy();
- return;
- }
- if (!state.equals(LifecycleState.INITIALIZED) &&
!state.equals(LifecycleState.STOPPED)) {
+ } else if (!state.equals(LifecycleState.INITIALIZED) &&
!state.equals(LifecycleState.STOPPED)) {
invalidTransition(BEFORE_START_EVENT);
}
@@ -290,8 +285,7 @@ public abstract class LifecycleBase implements Lifecycle {
}
if (!state.equals(LifecycleState.STOPPED) &&
!state.equals(LifecycleState.FAILED) &&
- !state.equals(LifecycleState.NEW) &&
!state.equals(LifecycleState.INITIALIZED) &&
- !state.equals(LifecycleState.FAILED_INIT)) {
+ !state.equals(LifecycleState.NEW) &&
!state.equals(LifecycleState.INITIALIZED)) {
invalidTransition(BEFORE_DESTROY_EVENT);
}
@@ -377,12 +371,9 @@ public abstract class LifecycleBase implements Lifecycle {
// stopInternal() permits STOPPING_PREP to STOPPING and FAILED to
// STOPPING
if (!(state == LifecycleState.FAILED ||
- (this.state == LifecycleState.INITIALIZING && state ==
LifecycleState.FAILED_INIT) ||
- (this.state == LifecycleState.DESTROYING && state ==
LifecycleState.FAILED_INIT) ||
(this.state == LifecycleState.STARTING_PREP && state ==
LifecycleState.STARTING) ||
(this.state == LifecycleState.STOPPING_PREP && state ==
LifecycleState.STOPPING) ||
- (this.state == LifecycleState.FAILED && state ==
LifecycleState.STOPPING) ||
- (this.state == LifecycleState.FAILED_INIT && state ==
LifecycleState.DESTROYING))) {
+ (this.state == LifecycleState.FAILED && state ==
LifecycleState.STOPPING))) {
// No other transition permitted
invalidTransition(state.name());
}
@@ -403,11 +394,7 @@ public abstract class LifecycleBase implements Lifecycle {
private void handleSubClassException(Throwable t, String key, Object...
args) throws LifecycleException {
- if (LifecycleState.INITIALIZING.equals(state) ||
LifecycleState.DESTROYING.equals(state)) {
- setStateInternal(LifecycleState.FAILED_INIT, null, false);
- } else {
- setStateInternal(LifecycleState.FAILED, null, false);
- }
+ setStateInternal(LifecycleState.FAILED, null, false);
ExceptionUtils.handleThrowable(t);
String msg = sm.getString(key, args);
if (getThrowOnFailure()) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cc0be45ccc..aba10cc4db 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -199,12 +199,6 @@
Implement WebDAV <code>PROPPATCH</code> method using the newly added
<code>PropertyStore</code>. (remm)
</update>
- <update>
- Add new <code>lifecycleState.FAILED_INIT</code> to identify failures
- during initialization. Otherwise, start and stop could be attempted
- on a <code>Lifecycle</code> that did not go through initialization.
- (remm)
- </update>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
