aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordarcy <none@none>2013-11-13 11:06:57 -0800
committerdarcy <none@none>2013-11-13 11:06:57 -0800
commit0e7cac59c1b147c47ba1f2041f38f66cc6484032 (patch)
tree578278c701da7364c4891dee810ca4314e484fcc /src
parent3ce589118747fe79629c87ba66984490c95ffa95 (diff)
8028300: Fix raw type lint warnings in java.util.concurrent
Reviewed-by: chegar, martin
Diffstat (limited to 'src')
-rw-r--r--src/share/classes/java/util/concurrent/ForkJoinPool.java2
-rw-r--r--src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/share/classes/java/util/concurrent/ForkJoinPool.java b/src/share/classes/java/util/concurrent/ForkJoinPool.java
index 749f8b573..edf17873b 100644
--- a/src/share/classes/java/util/concurrent/ForkJoinPool.java
+++ b/src/share/classes/java/util/concurrent/ForkJoinPool.java
@@ -1820,7 +1820,7 @@ public class ForkJoinPool extends AbstractExecutorService {
}
}
for (;;) { // help stealer or descend to its stealer
- ForkJoinTask[] a; int b;
+ ForkJoinTask<?>[] a; int b;
if (subtask.status < 0) // surround probes with
continue restart; // consistency checks
if ((b = v.base) - v.top < 0 && (a = v.array) != null) {
diff --git a/src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java b/src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
index 458828c90..24ab59acd 100644
--- a/src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
+++ b/src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
@@ -1253,11 +1253,11 @@ public class ScheduledThreadPoolExecutor
* Snapshot iterator that works off copy of underlying q array.
*/
private class Itr implements Iterator<Runnable> {
- final RunnableScheduledFuture[] array;
+ final RunnableScheduledFuture<?>[] array;
int cursor = 0; // index of next element to return
int lastRet = -1; // index of last element, or -1 if no such
- Itr(RunnableScheduledFuture[] array) {
+ Itr(RunnableScheduledFuture<?>[] array) {
this.array = array;
}