Index: modules/concurrent/standard/src/main/java/java/util/concurrent/ArrayBlockingQueue.java =================================================================== --- modules/concurrent/standard/src/main/java/java/util/concurrent/ArrayBlockingQueue.java (revision 465517) +++ modules/concurrent/standard/src/main/java/java/util/concurrent/ArrayBlockingQueue.java (working copy) @@ -549,7 +549,6 @@ try { int i = takeIndex; int n = 0; - int sz = count; int max = (maxElements < count)? maxElements : count; while (n < max) { c.add(items[i]); Index: modules/concurrent/standard/src/main/java/java/util/concurrent/ConcurrentHashMap.java =================================================================== --- modules/concurrent/standard/src/main/java/java/util/concurrent/ConcurrentHashMap.java (revision 465517) +++ modules/concurrent/standard/src/main/java/java/util/concurrent/ConcurrentHashMap.java (working copy) @@ -23,8 +23,6 @@ import java.util.*; import java.io.Serializable; import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; /** * A hash table supporting full concurrency of retrievals and @@ -726,10 +724,8 @@ final Segment[] segments = this.segments; int[] mc = new int[segments.length]; for (;;) { - int sum = 0; int mcsum = 0; for (int i = 0; i < segments.length; ++i) { - int c = segments[i].count; mcsum += mc[i] = segments[i].modCount; if (segments[i].containsValue(value)) return true; @@ -737,7 +733,6 @@ boolean cleanSweep = true; if (mcsum != 0) { for (int i = 0; i < segments.length; ++i) { - int c = segments[i].count; if (mc[i] != segments[i].modCount) { cleanSweep = false; break; Index: modules/concurrent/standard/src/main/java/java/util/concurrent/CountDownLatch.java =================================================================== --- modules/concurrent/standard/src/main/java/java/util/concurrent/CountDownLatch.java (revision 465517) +++ modules/concurrent/standard/src/main/java/java/util/concurrent/CountDownLatch.java (working copy) @@ -6,7 +6,6 @@ package java.util.concurrent; import java.util.concurrent.locks.*; -import java.util.concurrent.atomic.*; /** * A synchronization aid that allows one or more threads to wait until Index: modules/concurrent/standard/src/main/java/java/util/concurrent/Delayed.java =================================================================== --- modules/concurrent/standard/src/main/java/java/util/concurrent/Delayed.java (revision 465517) +++ modules/concurrent/standard/src/main/java/java/util/concurrent/Delayed.java (working copy) @@ -6,8 +6,6 @@ package java.util.concurrent; -import java.util.*; - /** * A mix-in style interface for marking objects that should be * acted upon after a given delay. Index: modules/concurrent/standard/src/main/java/java/util/concurrent/DelayQueue.java =================================================================== --- modules/concurrent/standard/src/main/java/java/util/concurrent/DelayQueue.java (revision 465517) +++ modules/concurrent/standard/src/main/java/java/util/concurrent/DelayQueue.java (working copy) @@ -120,9 +120,7 @@ available.await(); } else { long delay = first.getDelay(TimeUnit.NANOSECONDS); - if (delay > 0) { - long tl = available.awaitNanos(delay); - } else { + if (delay <= 0) { E x = q.poll(); assert x != null; if (q.size() != 0) Index: modules/concurrent/standard/src/main/java/java/util/concurrent/Executors.java =================================================================== --- modules/concurrent/standard/src/main/java/java/util/concurrent/Executors.java (revision 465517) +++ modules/concurrent/standard/src/main/java/java/util/concurrent/Executors.java (working copy) @@ -11,7 +11,6 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedExceptionAction; -import java.security.AccessControlException; /** * Factory and utility methods for {@link Executor}, {@link Index: modules/concurrent/standard/src/main/java/java/util/concurrent/ExecutorService.java =================================================================== --- modules/concurrent/standard/src/main/java/java/util/concurrent/ExecutorService.java (revision 465517) +++ modules/concurrent/standard/src/main/java/java/util/concurrent/ExecutorService.java (working copy) @@ -8,8 +8,6 @@ import java.util.List; import java.util.Collection; -import java.security.PrivilegedAction; -import java.security.PrivilegedExceptionAction; /** * An {@link Executor} that provides methods to manage termination and Index: modules/concurrent/standard/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java =================================================================== --- modules/concurrent/standard/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java (revision 465517) +++ modules/concurrent/standard/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java (working copy) @@ -7,7 +7,6 @@ package java.util.concurrent.locks; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.atomic.*; import sun.misc.Unsafe; /** Index: modules/concurrent/standard/src/main/java/java/util/concurrent/locks/LockSupport.java =================================================================== --- modules/concurrent/standard/src/main/java/java/util/concurrent/locks/LockSupport.java (revision 465517) +++ modules/concurrent/standard/src/main/java/java/util/concurrent/locks/LockSupport.java (working copy) @@ -5,7 +5,6 @@ */ package java.util.concurrent.locks; -import java.util.concurrent.*; import sun.misc.Unsafe; Index: modules/concurrent/standard/src/main/java/java/util/concurrent/locks/ReentrantLock.java =================================================================== --- modules/concurrent/standard/src/main/java/java/util/concurrent/locks/ReentrantLock.java (revision 465517) +++ modules/concurrent/standard/src/main/java/java/util/concurrent/locks/ReentrantLock.java (working copy) @@ -7,7 +7,6 @@ package java.util.concurrent.locks; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.atomic.*; /** * A reentrant mutual exclusion {@link Lock} with the same basic Index: modules/concurrent/standard/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java =================================================================== --- modules/concurrent/standard/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java (revision 465517) +++ modules/concurrent/standard/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java (working copy) @@ -6,7 +6,6 @@ package java.util.concurrent.locks; import java.util.concurrent.*; -import java.util.concurrent.atomic.*; import java.util.*; /** Index: modules/concurrent/standard/src/main/java/java/util/concurrent/ScheduledExecutorService.java =================================================================== --- modules/concurrent/standard/src/main/java/java/util/concurrent/ScheduledExecutorService.java (revision 465517) +++ modules/concurrent/standard/src/main/java/java/util/concurrent/ScheduledExecutorService.java (working copy) @@ -5,8 +5,6 @@ */ package java.util.concurrent; -import java.util.concurrent.atomic.*; -import java.util.*; /** * An {@link ExecutorService} that can schedule commands to run after a given Index: modules/concurrent/standard/src/main/java/java/util/concurrent/Semaphore.java =================================================================== --- modules/concurrent/standard/src/main/java/java/util/concurrent/Semaphore.java (revision 465517) +++ modules/concurrent/standard/src/main/java/java/util/concurrent/Semaphore.java (working copy) @@ -7,7 +7,6 @@ package java.util.concurrent; import java.util.*; import java.util.concurrent.locks.*; -import java.util.concurrent.atomic.*; /** * A counting semaphore. Conceptually, a semaphore maintains a set of Index: modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/JSParameters.java =================================================================== --- modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/JSParameters.java (revision 465516) +++ modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/JSParameters.java (working copy) @@ -100,12 +100,6 @@ // name of the provider to work with keystore private String ksProviderName; - // class name of the provider to work with message digests - private String mdProvider; - - // name of the provider to work with message digests - private String mdProviderName; - // timestamp authority URL private URI tsaURI; Index: modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertImporter.java =================================================================== --- modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertImporter.java (revision 465516) +++ modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertImporter.java (working copy) @@ -19,7 +19,6 @@ import java.io.FileNotFoundException; import java.io.IOException; -import java.security.InvalidAlgorithmParameterException; import java.security.KeyStore; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; Index: modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java =================================================================== --- modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java (revision 465516) +++ modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java (working copy) @@ -35,7 +35,6 @@ import java.security.cert.Certificate; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; -import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.Random;