You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/04/10 16:00:25 UTC
svn commit: r1738434 - in
/sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads:
ThreadPool.java impl/DefaultThreadPool.java package-info.java
Author: olli
Date: Sun Apr 10 14:00:25 2016
New Revision: 1738434
URL: http://svn.apache.org/viewvc?rev=1738434&view=rev
Log:
SLING-5651 ThreadPool should extend Executor
Modified:
sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPool.java
sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java
sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/package-info.java
Modified: sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPool.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPool.java?rev=1738434&r1=1738433&r2=1738434&view=diff
==============================================================================
--- sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPool.java (original)
+++ sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPool.java Sun Apr 10 14:00:25 2016
@@ -19,6 +19,7 @@ package org.apache.sling.commons.threads
import aQute.bnd.annotation.ProviderType;
import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
import java.util.concurrent.Future;
/**
@@ -26,13 +27,7 @@ import java.util.concurrent.Future;
* getting threads from a managed pool.
*/
@ProviderType
-public interface ThreadPool {
-
- /**
- * Execute a runnable
- * @param runnable The {@link Runnable} to execute
- */
- void execute(Runnable runnable);
+public interface ThreadPool extends Executor {
/**
* Submits a callable for execution
Modified: sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java?rev=1738434&r1=1738433&r2=1738434&view=diff
==============================================================================
--- sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java (original)
+++ sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java Sun Apr 10 14:00:25 2016
@@ -21,6 +21,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.RejectedExecutionHandler;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadFactory;
@@ -229,7 +230,7 @@ public class DefaultThreadPool
private void checkExecutor() {
if ( this.executor == null ) {
- throw new IllegalStateException("Thread pool " + this.name + " is already shutdown.");
+ throw new RejectedExecutionException("Thread pool " + this.name + " is already shutdown.");
}
}
Modified: sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/package-info.java?rev=1738434&r1=1738433&r2=1738434&view=diff
==============================================================================
--- sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/package-info.java (original)
+++ sling/trunk/bundles/commons/threads/src/main/java/org/apache/sling/commons/threads/package-info.java Sun Apr 10 14:00:25 2016
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("3.3.0")
+@Version("3.4.0")
package org.apache.sling.commons.threads;
-import aQute.bnd.annotation.Version;
\ No newline at end of file
+import aQute.bnd.annotation.Version;