harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r901631 [1/3] - in /harmony/enhanced/classlib/tags/5.0m12a: ./ make/ modules/concurrent/src/main/java/java/util/concurrent/ modules/concurrent/src/main/java/java/util/concurrent/atomic/ modules/concurrent/src/main/java/java/util/concurrent/...
Date Thu, 21 Jan 2010 10:01:16 GMT
Author: hindessm
Date: Thu Jan 21 10:01:13 2010
New Revision: 901631

URL: http://svn.apache.org/viewvc?rev=901631&view=rev
Log:
Merging change 901123 from classlib trunk:

  r901123 | hindessm | 2010-01-20 10:43:57 +0000 (Wed, 20 Jan 2010) | 8 lines

  Reverting part of commit r794678:

    Applying patch from "[#HARMONY-6262] Harmony's java.util.concurrent is
    out of date".

  to put back Harmony implementation of CopyOnWriteArrayList.

Modified:
    harmony/enhanced/classlib/tags/5.0m12a/   (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/make/depends-common.xml   (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/BrokenBarrierException.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/Callable.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/CancellationException.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/CompletionService.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/CountDownLatch.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/CyclicBarrier.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/DelayQueue.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/Exchanger.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ExecutionException.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/Executor.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ExecutorCompletionService.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ExecutorService.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/Executors.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/Future.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/FutureTask.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionException.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionHandler.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ScheduledExecutorService.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ScheduledFuture.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/Semaphore.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ThreadFactory.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/TimeoutException.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/atomic/
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/locks/
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AbstractExecutorServiceTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AbstractQueueTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/ArrayBlockingQueueTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AtomicBooleanTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AtomicIntegerArrayTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AtomicIntegerFieldUpdaterTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AtomicIntegerTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AtomicLongArrayTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AtomicLongFieldUpdaterTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AtomicLongTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AtomicMarkableReferenceTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AtomicReferenceArrayTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AtomicReferenceFieldUpdaterTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AtomicReferenceTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/AtomicStampedReferenceTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/ConcurrentHashMapTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/ConcurrentLinkedQueueTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/CopyOnWriteArrayListTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/CopyOnWriteArraySetTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/CountDownLatchTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/CyclicBarrierTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/DelayQueueTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/ExchangerTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/ExecutorCompletionServiceTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/ExecutorsTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/FutureTaskTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/JSR166TestCase.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/LinkedBlockingQueueTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/LinkedListTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/LockSupportTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/PriorityBlockingQueueTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/PriorityQueueTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/ReentrantLockTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/ReentrantReadWriteLockTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/ScheduledExecutorTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/SemaphoreTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/SynchronousQueueTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/SystemTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/ThreadLocalTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/ThreadPoolExecutorTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/ThreadTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/test/java/TimeUnitTest.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/jmx/META-INF/   (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/include/fdlibm.h 
 (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/include/gp.h   (props
changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/include/hymagic.h
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/include/hysocket.h
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/include/hyvmls.h 
 (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/include/jni.h   (props
changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/include/jni_types.h
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/include/jvmpi.h  
(props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/include/jvmri.h  
(props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/include/jvmti.h  
(props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/include/jvmti_types.h
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/include/vmi.h   (props
changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/include/vmizip.h 
 (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/luni/shared/OSMemory.c
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/main/native/luni/shared/OSMemory.h
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/luni/src/test/resources/net.resources/
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/nio_char/src/main/native/niochar/windows/hyniochar.def
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/pack200/depends/manifests/asm-3.1/   (props
changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/suncompat/src/main/java/com/sun/image/codec/jpeg/JPEGImageEncoderImpl.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java
  (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/swing/src/test/api/java.injected/javax/swing/text/parser/
  (props changed)

Propchange: harmony/enhanced/classlib/tags/5.0m12a/
------------------------------------------------------------------------------
    svn:mergeinfo = /harmony/enhanced/classlib/trunk:901123

Propchange: harmony/enhanced/classlib/tags/5.0m12a/make/depends-common.xml
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/BrokenBarrierException.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/Callable.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/CancellationException.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/CompletionService.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java
            ('svn:mergeinfo' removed)



Mime
View raw message