Remove usages of deprecated ThreadDeath (#8487)

jenkinsci · Sep 20, 2023 · 807243e · 807243e
1 parent febca34
commit 807243e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
@@ -1896,8 +1896,6 @@ protected final void execute(@NonNull RunExecution job) {
 
                     LOGGER.log(FINE, "{0} main build action completed: {1}", new Object[] {this, result});
                     CheckPoint.MAIN_COMPLETED.report();
-                } catch (ThreadDeath t) {
-                    throw t;
                 } catch (AbortException e) { // orderly abortion.
                     result = Result.FAILURE;
                     listener.error(e.getMessage());
@@ -1919,8 +1917,6 @@ protected final void execute(@NonNull RunExecution job) {
                 // even if the main build fails fatally, try to run post build processing
                 job.post(Objects.requireNonNull(listener));
 
-            } catch (ThreadDeath t) {
-                throw t;
             } catch (Throwable e) {
                 handleFatalBuildProblem(listener, e);
                 result = Result.FAILURE;

diff --git a/core/src/main/java/hudson/model/listeners/SaveableListener.java b/core/src/main/java/hudson/model/listeners/SaveableListener.java
@@ -80,8 +80,6 @@ public static void fireOnChange(Saveable o, XmlFile file) {
         for (SaveableListener l : all()) {
             try {
                 l.onChange(o, file);
-            } catch (ThreadDeath t) {
-                throw t;
             } catch (Throwable t) {
                 Logger.getLogger(SaveableListener.class.getName()).log(Level.WARNING, null, t);
             }