diff options
| -rw-r--r-- | luni/src/main/java/java/util/concurrent/ThreadPoolExecutor.java | 11 | ||||
| -rw-r--r-- | luni/src/test/java/libcore/java/util/concurrent/ThreadPoolExecutorTest.java | 40 |
2 files changed, 48 insertions, 3 deletions
diff --git a/luni/src/main/java/java/util/concurrent/ThreadPoolExecutor.java b/luni/src/main/java/java/util/concurrent/ThreadPoolExecutor.java index e601b6ab8f..8f7347aca7 100644 --- a/luni/src/main/java/java/util/concurrent/ThreadPoolExecutor.java +++ b/luni/src/main/java/java/util/concurrent/ThreadPoolExecutor.java @@ -1520,12 +1520,17 @@ public class ThreadPoolExecutor extends AbstractExecutorService { * * @param corePoolSize the new core size * @throws IllegalArgumentException if {@code corePoolSize < 0} - * or {@code corePoolSize} is greater than the {@linkplain - * #getMaximumPoolSize() maximum pool size} * @see #getCorePoolSize */ + // Android-changed: Reverted code that threw an IAE when + // {@code corePoolSize} is greater than the {@linkplain #getMaximumPoolSize() + // maximum pool size}. This is due to defective code in a commonly used third + // party library that does something like : + // + // exec.setCorePoolSize(N); + // exec.setMaxPoolSize(N); public void setCorePoolSize(int corePoolSize) { - if (corePoolSize < 0 || maximumPoolSize < corePoolSize) + if (corePoolSize < 0) throw new IllegalArgumentException(); int delta = corePoolSize - this.corePoolSize; this.corePoolSize = corePoolSize; diff --git a/luni/src/test/java/libcore/java/util/concurrent/ThreadPoolExecutorTest.java b/luni/src/test/java/libcore/java/util/concurrent/ThreadPoolExecutorTest.java new file mode 100644 index 0000000000..4273598201 --- /dev/null +++ b/luni/src/test/java/libcore/java/util/concurrent/ThreadPoolExecutorTest.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package libcore.java.util.concurrent; + +import junit.framework.TestCase; + +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +public class ThreadPoolExecutorTest extends TestCase { + + // http://b/27702221 + public void testCorePoolSizeGreaterThanMax() { + ThreadPoolExecutor tp = new ThreadPoolExecutor( + 1 /* core pool size */, 1 /* max pool size */, + 1000, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<>(10)); + + // It should be illegal to set a core pool size that's larger than the max + // pool size but apps have been allowed to get away with it so far. The pattern + // below occurs in a commonly used library. Note that the executor is in a sane + // state at the end of both method calls. + tp.setCorePoolSize(5); + tp.setMaximumPoolSize(5); + } +} |