Expose shutdown state in TaskRejectedException message

jhoeller · jhoeller · commit 464b676ec592 · 2023-07-07T23:59:10.000+02:00
See gh-27090
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
@@ -206,7 +206,7 @@ public ScheduledFuture<?> schedule(Runnable task, Trigger trigger) {
 			}
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + this.scheduledExecutor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(this.scheduledExecutor, task, ex);
 		}
 	}
 
@@ -217,7 +217,7 @@ public ScheduledFuture<?> schedule(Runnable task, Instant startTime) {
 			return this.scheduledExecutor.schedule(decorateTask(task, false), NANO.convert(delay), NANO);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + this.scheduledExecutor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(this.scheduledExecutor, task, ex);
 		}
 	}
 
@@ -229,7 +229,7 @@ public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Instant startTime,
 					NANO.convert(initialDelay), NANO.convert(period), NANO);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + this.scheduledExecutor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(this.scheduledExecutor, task, ex);
 		}
 	}
 
@@ -240,7 +240,7 @@ public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Duration period) {
 					0, NANO.convert(period), NANO);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + this.scheduledExecutor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(this.scheduledExecutor, task, ex);
 		}
 	}
 
@@ -252,7 +252,7 @@ public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Instant startTim
 					NANO.convert(initialDelay), NANO.convert(delay), NANO);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + this.scheduledExecutor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(this.scheduledExecutor, task, ex);
 		}
 	}
 
@@ -263,7 +263,7 @@ public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Duration delay)
 					0, NANO.convert(delay), NANO);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + this.scheduledExecutor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(this.scheduledExecutor, task, ex);
 		}
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
@@ -362,7 +362,7 @@ public void execute(Runnable task) {
 			executor.execute(task);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -373,7 +373,7 @@ public Future<?> submit(Runnable task) {
 			return executor.submit(task);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -384,7 +384,7 @@ public <T> Future<T> submit(Callable<T> task) {
 			return executor.submit(task);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -397,7 +397,7 @@ public ListenableFuture<?> submitListenable(Runnable task) {
 			return future;
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -410,7 +410,7 @@ public <T> ListenableFuture<T> submitListenable(Callable<T> task) {
 			return future;
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
@@ -290,7 +290,7 @@ public void execute(Runnable task) {
 			executor.execute(errorHandlingTask(task, false));
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -301,7 +301,7 @@ public Future<?> submit(Runnable task) {
 			return executor.submit(errorHandlingTask(task, false));
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -317,7 +317,7 @@ public <T> Future<T> submit(Callable<T> task) {
 			return executor.submit(taskToUse);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -330,7 +330,7 @@ public ListenableFuture<?> submitListenable(Runnable task) {
 			return listenableFuture;
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -343,7 +343,7 @@ public <T> ListenableFuture<T> submitListenable(Callable<T> task) {
 			return listenableFuture;
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -379,7 +379,7 @@ public ScheduledFuture<?> schedule(Runnable task, Trigger trigger) {
 			return new ReschedulingRunnable(task, trigger, this.clock, executor, errorHandler).schedule();
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -391,7 +391,7 @@ public ScheduledFuture<?> schedule(Runnable task, Instant startTime) {
 			return executor.schedule(errorHandlingTask(task, false), NANO.convert(delay), NANO);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -404,7 +404,7 @@ public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Instant startTime,
 					NANO.convert(initialDelay), NANO.convert(period), NANO);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -416,7 +416,7 @@ public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Duration period) {
 					0, NANO.convert(period), NANO);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -429,7 +429,7 @@ public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Instant startTim
 					NANO.convert(initialDelay), NANO.convert(delay), NANO);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
@@ -441,7 +441,7 @@ public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Duration delay)
 					0, NANO.convert(delay), NANO);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(executor, task, ex);
 		}
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.core.task;
 
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
 
 /**
@@ -50,4 +52,26 @@ public TaskRejectedException(String msg, Throwable cause) {
 		super(msg, cause);
 	}
 
+	/**
+	 * Create a new {@code TaskRejectedException}
+	 * with a default message for the given executor and task.
+	 * @param executor the {@code Executor} that rejected the task
+	 * @param task the task object that got rejected
+	 * @param cause the original {@link RejectedExecutionException}
+	 * @since 6.1
+	 * @see ExecutorService#isShutdown()
+	 * @see java.util.concurrent.RejectedExecutionException
+	 */
+	public TaskRejectedException(Executor executor, Object task, RejectedExecutionException cause) {
+		super(executorDescription(executor) + " did not accept task: " + task, cause);
+	}
+
+
+	private static String executorDescription(Executor executor) {
+		if (executor instanceof ExecutorService executorService) {
+			return "ExecutorService in " + (executorService.isShutdown() ? "shutdown" : "active") + " state";
+		}
+		return executor.toString();
+	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java
@@ -93,8 +93,7 @@ public void execute(Runnable task) {
 			doExecute(this.concurrentExecutor, this.taskDecorator, task);
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException(
-					"Executor [" + this.concurrentExecutor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(this.concurrentExecutor, task, ex);
 		}
 	}
 
@@ -112,8 +111,7 @@ public Future<?> submit(Runnable task) {
 			}
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException(
-					"Executor [" + this.concurrentExecutor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(this.concurrentExecutor, task, ex);
 		}
 	}
 
@@ -131,8 +129,7 @@ public <T> Future<T> submit(Callable<T> task) {
 			}
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException(
-					"Executor [" + this.concurrentExecutor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(this.concurrentExecutor, task, ex);
 		}
 	}
 
@@ -144,8 +141,7 @@ public ListenableFuture<?> submitListenable(Runnable task) {
 			return future;
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException(
-					"Executor [" + this.concurrentExecutor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(this.concurrentExecutor, task, ex);
 		}
 	}
 
@@ -157,8 +153,7 @@ public <T> ListenableFuture<T> submitListenable(Callable<T> task) {
 			return future;
 		}
 		catch (RejectedExecutionException ex) {
-			throw new TaskRejectedException(
-					"Executor [" + this.concurrentExecutor + "] did not accept task: " + task, ex);
+			throw new TaskRejectedException(this.concurrentExecutor, task, ex);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ public ScheduledFuture<?> schedule(Runnable task, Trigger trigger) {`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`	`catch (RejectedExecutionException ex) {`
`209`		`- throw new TaskRejectedException("Executor [" + this.scheduledExecutor + "] did not accept task: " + task, ex);`
	`209`	`+ throw new TaskRejectedException(this.scheduledExecutor, task, ex);`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`
`@@ -217,7 +217,7 @@ public ScheduledFuture<?> schedule(Runnable task, Instant startTime) {`
`217`	`217`	`return this.scheduledExecutor.schedule(decorateTask(task, false), NANO.convert(delay), NANO);`
`218`	`218`	`}`
`219`	`219`	`catch (RejectedExecutionException ex) {`
`220`		`- throw new TaskRejectedException("Executor [" + this.scheduledExecutor + "] did not accept task: " + task, ex);`
	`220`	`+ throw new TaskRejectedException(this.scheduledExecutor, task, ex);`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`
`@@ -229,7 +229,7 @@ public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Instant startTime,`
`229`	`229`	`NANO.convert(initialDelay), NANO.convert(period), NANO);`
`230`	`230`	`}`
`231`	`231`	`catch (RejectedExecutionException ex) {`
`232`		`- throw new TaskRejectedException("Executor [" + this.scheduledExecutor + "] did not accept task: " + task, ex);`
	`232`	`+ throw new TaskRejectedException(this.scheduledExecutor, task, ex);`
`233`	`233`	`}`
`234`	`234`	`}`
`235`	`235`
`@@ -240,7 +240,7 @@ public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Duration period) {`
`240`	`240`	`0, NANO.convert(period), NANO);`
`241`	`241`	`}`
`242`	`242`	`catch (RejectedExecutionException ex) {`
`243`		`- throw new TaskRejectedException("Executor [" + this.scheduledExecutor + "] did not accept task: " + task, ex);`
	`243`	`+ throw new TaskRejectedException(this.scheduledExecutor, task, ex);`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`
`@@ -252,7 +252,7 @@ public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Instant startTim`
`252`	`252`	`NANO.convert(initialDelay), NANO.convert(delay), NANO);`
`253`	`253`	`}`
`254`	`254`	`catch (RejectedExecutionException ex) {`
`255`		`- throw new TaskRejectedException("Executor [" + this.scheduledExecutor + "] did not accept task: " + task, ex);`
	`255`	`+ throw new TaskRejectedException(this.scheduledExecutor, task, ex);`
`256`	`256`	`}`
`257`	`257`	`}`
`258`	`258`
`@@ -263,7 +263,7 @@ public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Duration delay)`
`263`	`263`	`0, NANO.convert(delay), NANO);`
`264`	`264`	`}`
`265`	`265`	`catch (RejectedExecutionException ex) {`
`266`		`- throw new TaskRejectedException("Executor [" + this.scheduledExecutor + "] did not accept task: " + task, ex);`
	`266`	`+ throw new TaskRejectedException(this.scheduledExecutor, task, ex);`
`267`	`267`	`}`
`268`	`268`	`}`
`269`	`269`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ public void execute(Runnable task) {`
`362`	`362`	`executor.execute(task);`
`363`	`363`	`}`
`364`	`364`	`catch (RejectedExecutionException ex) {`
`365`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`365`	`+ throw new TaskRejectedException(executor, task, ex);`
`366`	`366`	`}`
`367`	`367`	`}`
`368`	`368`
`@@ -373,7 +373,7 @@ public Future<?> submit(Runnable task) {`
`373`	`373`	`return executor.submit(task);`
`374`	`374`	`}`
`375`	`375`	`catch (RejectedExecutionException ex) {`
`376`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`376`	`+ throw new TaskRejectedException(executor, task, ex);`
`377`	`377`	`}`
`378`	`378`	`}`
`379`	`379`
`@@ -384,7 +384,7 @@ public <T> Future<T> submit(Callable<T> task) {`
`384`	`384`	`return executor.submit(task);`
`385`	`385`	`}`
`386`	`386`	`catch (RejectedExecutionException ex) {`
`387`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`387`	`+ throw new TaskRejectedException(executor, task, ex);`
`388`	`388`	`}`
`389`	`389`	`}`
`390`	`390`
`@@ -397,7 +397,7 @@ public ListenableFuture<?> submitListenable(Runnable task) {`
`397`	`397`	`return future;`
`398`	`398`	`}`
`399`	`399`	`catch (RejectedExecutionException ex) {`
`400`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`400`	`+ throw new TaskRejectedException(executor, task, ex);`
`401`	`401`	`}`
`402`	`402`	`}`
`403`	`403`
`@@ -410,7 +410,7 @@ public <T> ListenableFuture<T> submitListenable(Callable<T> task) {`
`410`	`410`	`return future;`
`411`	`411`	`}`
`412`	`412`	`catch (RejectedExecutionException ex) {`
`413`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`413`	`+ throw new TaskRejectedException(executor, task, ex);`
`414`	`414`	`}`
`415`	`415`	`}`
`416`	`416`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ public void execute(Runnable task) {`
`290`	`290`	`executor.execute(errorHandlingTask(task, false));`
`291`	`291`	`}`
`292`	`292`	`catch (RejectedExecutionException ex) {`
`293`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`293`	`+ throw new TaskRejectedException(executor, task, ex);`
`294`	`294`	`}`
`295`	`295`	`}`
`296`	`296`
`@@ -301,7 +301,7 @@ public Future<?> submit(Runnable task) {`
`301`	`301`	`return executor.submit(errorHandlingTask(task, false));`
`302`	`302`	`}`
`303`	`303`	`catch (RejectedExecutionException ex) {`
`304`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`304`	`+ throw new TaskRejectedException(executor, task, ex);`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`
`@@ -317,7 +317,7 @@ public <T> Future<T> submit(Callable<T> task) {`
`317`	`317`	`return executor.submit(taskToUse);`
`318`	`318`	`}`
`319`	`319`	`catch (RejectedExecutionException ex) {`
`320`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`320`	`+ throw new TaskRejectedException(executor, task, ex);`
`321`	`321`	`}`
`322`	`322`	`}`
`323`	`323`
`@@ -330,7 +330,7 @@ public ListenableFuture<?> submitListenable(Runnable task) {`
`330`	`330`	`return listenableFuture;`
`331`	`331`	`}`
`332`	`332`	`catch (RejectedExecutionException ex) {`
`333`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`333`	`+ throw new TaskRejectedException(executor, task, ex);`
`334`	`334`	`}`
`335`	`335`	`}`
`336`	`336`
`@@ -343,7 +343,7 @@ public <T> ListenableFuture<T> submitListenable(Callable<T> task) {`
`343`	`343`	`return listenableFuture;`
`344`	`344`	`}`
`345`	`345`	`catch (RejectedExecutionException ex) {`
`346`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`346`	`+ throw new TaskRejectedException(executor, task, ex);`
`347`	`347`	`}`
`348`	`348`	`}`
`349`	`349`
`@@ -379,7 +379,7 @@ public ScheduledFuture<?> schedule(Runnable task, Trigger trigger) {`
`379`	`379`	`return new ReschedulingRunnable(task, trigger, this.clock, executor, errorHandler).schedule();`
`380`	`380`	`}`
`381`	`381`	`catch (RejectedExecutionException ex) {`
`382`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`382`	`+ throw new TaskRejectedException(executor, task, ex);`
`383`	`383`	`}`
`384`	`384`	`}`
`385`	`385`
`@@ -391,7 +391,7 @@ public ScheduledFuture<?> schedule(Runnable task, Instant startTime) {`
`391`	`391`	`return executor.schedule(errorHandlingTask(task, false), NANO.convert(delay), NANO);`
`392`	`392`	`}`
`393`	`393`	`catch (RejectedExecutionException ex) {`
`394`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`394`	`+ throw new TaskRejectedException(executor, task, ex);`
`395`	`395`	`}`
`396`	`396`	`}`
`397`	`397`
`@@ -404,7 +404,7 @@ public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Instant startTime,`
`404`	`404`	`NANO.convert(initialDelay), NANO.convert(period), NANO);`
`405`	`405`	`}`
`406`	`406`	`catch (RejectedExecutionException ex) {`
`407`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`407`	`+ throw new TaskRejectedException(executor, task, ex);`
`408`	`408`	`}`
`409`	`409`	`}`
`410`	`410`
`@@ -416,7 +416,7 @@ public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Duration period) {`
`416`	`416`	`0, NANO.convert(period), NANO);`
`417`	`417`	`}`
`418`	`418`	`catch (RejectedExecutionException ex) {`
`419`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`419`	`+ throw new TaskRejectedException(executor, task, ex);`
`420`	`420`	`}`
`421`	`421`	`}`
`422`	`422`
`@@ -429,7 +429,7 @@ public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Instant startTim`
`429`	`429`	`NANO.convert(initialDelay), NANO.convert(delay), NANO);`
`430`	`430`	`}`
`431`	`431`	`catch (RejectedExecutionException ex) {`
`432`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`432`	`+ throw new TaskRejectedException(executor, task, ex);`
`433`	`433`	`}`
`434`	`434`	`}`
`435`	`435`
`@@ -441,7 +441,7 @@ public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Duration delay)`
`441`	`441`	`0, NANO.convert(delay), NANO);`
`442`	`442`	`}`
`443`	`443`	`catch (RejectedExecutionException ex) {`
`444`		`- throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);`
	`444`	`+ throw new TaskRejectedException(executor, task, ex);`
`445`	`445`	`}`
`446`	`446`	`}`
`447`	`447`
Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,7 @@ public void execute(Runnable task) {`
`93`	`93`	`doExecute(this.concurrentExecutor, this.taskDecorator, task);`
`94`	`94`	`}`
`95`	`95`	`catch (RejectedExecutionException ex) {`
`96`		`- throw new TaskRejectedException(`
`97`		`- "Executor [" + this.concurrentExecutor + "] did not accept task: " + task, ex);`
	`96`	`+ throw new TaskRejectedException(this.concurrentExecutor, task, ex);`
`98`	`97`	`}`
`99`	`98`	`}`
`100`	`99`
`@@ -112,8 +111,7 @@ public Future<?> submit(Runnable task) {`
`112`	`111`	`}`
`113`	`112`	`}`
`114`	`113`	`catch (RejectedExecutionException ex) {`
`115`		`- throw new TaskRejectedException(`
`116`		`- "Executor [" + this.concurrentExecutor + "] did not accept task: " + task, ex);`
	`114`	`+ throw new TaskRejectedException(this.concurrentExecutor, task, ex);`
`117`	`115`	`}`
`118`	`116`	`}`
`119`	`117`
`@@ -131,8 +129,7 @@ public <T> Future<T> submit(Callable<T> task) {`
`131`	`129`	`}`
`132`	`130`	`}`
`133`	`131`	`catch (RejectedExecutionException ex) {`
`134`		`- throw new TaskRejectedException(`
`135`		`- "Executor [" + this.concurrentExecutor + "] did not accept task: " + task, ex);`
	`132`	`+ throw new TaskRejectedException(this.concurrentExecutor, task, ex);`
`136`	`133`	`}`
`137`	`134`	`}`
`138`	`135`
`@@ -144,8 +141,7 @@ public ListenableFuture<?> submitListenable(Runnable task) {`
`144`	`141`	`return future;`
`145`	`142`	`}`
`146`	`143`	`catch (RejectedExecutionException ex) {`
`147`		`- throw new TaskRejectedException(`
`148`		`- "Executor [" + this.concurrentExecutor + "] did not accept task: " + task, ex);`
	`144`	`+ throw new TaskRejectedException(this.concurrentExecutor, task, ex);`
`149`	`145`	`}`
`150`	`146`	`}`
`151`	`147`
`@@ -157,8 +153,7 @@ public <T> ListenableFuture<T> submitListenable(Callable<T> task) {`
`157`	`153`	`return future;`
`158`	`154`	`}`
`159`	`155`	`catch (RejectedExecutionException ex) {`
`160`		`- throw new TaskRejectedException(`
`161`		`- "Executor [" + this.concurrentExecutor + "] did not accept task: " + task, ex);`
	`156`	`+ throw new TaskRejectedException(this.concurrentExecutor, task, ex);`
`162`	`157`	`}`
`163`	`158`	`}`
`164`	`159`