hg: jdk7/tl/jdk: 2 new changesets

[alan.bateman at oracle.com]

Changeset: eb84b89ef3ff
Author:    alanb
Date:      2010-06-23 20:19 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/eb84b89ef3ff

6963027: TEST_BUG: channels and buffer tests need to run in samevm mode
Reviewed-by: ohair, sherman, chegar

! test/Makefile
! test/ProblemList.txt
! test/java/nio/BufferPoolMXBean/Basic.java
! test/java/nio/MappedByteBuffer/Basic.java
! test/java/nio/MappedByteBuffer/Force.java
! test/java/nio/MappedByteBuffer/ZeroMap.java
! test/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java
! test/java/nio/channels/AsynchronousChannelGroup/Identity.java
! test/java/nio/channels/AsynchronousDatagramChannel/Basic.java
! test/java/nio/channels/AsynchronousFileChannel/Basic.java
! test/java/nio/channels/AsynchronousFileChannel/Lock.java
! test/java/nio/channels/AsynchronousFileChannel/LotsOfWrites.java
! test/java/nio/channels/AsynchronousSocketChannel/Basic.java
! test/java/nio/channels/Channels/Basic2.java
! test/java/nio/channels/Channels/Write.java
! test/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java
! test/java/nio/channels/DatagramChannel/EmptyBuffer.java
! test/java/nio/channels/DatagramChannel/ReceiveISA.java
! test/java/nio/channels/DatagramChannel/SelectWhenRefused.java
! test/java/nio/channels/FileChannel/Args.java
! test/java/nio/channels/FileChannel/ClosedChannelTransfer.java
! test/java/nio/channels/FileChannel/ExpandingMap.java
! test/java/nio/channels/FileChannel/Lock.java
! test/java/nio/channels/FileChannel/MapOverEnd.java
! test/java/nio/channels/FileChannel/MapReadOnly.java
! test/java/nio/channels/FileChannel/MapTest.java
! test/java/nio/channels/FileChannel/Mode.java
! test/java/nio/channels/FileChannel/Position.java
! test/java/nio/channels/FileChannel/Pread.java
! test/java/nio/channels/FileChannel/Pwrite.java
! test/java/nio/channels/FileChannel/Read.java
! test/java/nio/channels/FileChannel/ReadFull.java
! test/java/nio/channels/FileChannel/ReadToLimit.java
! test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java
! test/java/nio/channels/FileChannel/ScatteringRead.java
! test/java/nio/channels/FileChannel/Size.java
! test/java/nio/channels/FileChannel/Transfer.java
! test/java/nio/channels/FileChannel/TransferToChannel.java
! test/java/nio/channels/FileChannel/TransferToNonWritable.java
! test/java/nio/channels/FileChannel/Transfers.java
! test/java/nio/channels/FileChannel/TryLock.java
! test/java/nio/channels/FileChannel/Write.java
! test/java/nio/channels/Pipe/NonBlocking.java
! test/java/nio/channels/Pipe/SelectPipe.java
! test/java/nio/channels/SelectionKey/AtomicAttachTest.java
! test/java/nio/channels/Selector/BasicAccept.java
! test/java/nio/channels/Selector/BasicConnect.java
! test/java/nio/channels/Selector/CheckLocking.java
! test/java/nio/channels/Selector/CloseInvalidatesKeys.java
! test/java/nio/channels/Selector/CloseWhenKeyIdle.java
! test/java/nio/channels/Selector/Connect.java
! test/java/nio/channels/Selector/ConnectWrite.java
! test/java/nio/channels/Selector/HelperSlowToDie.java
! test/java/nio/channels/Selector/KeysReady.java
! test/java/nio/channels/Selector/LotsOfChannels.java
! test/java/nio/channels/Selector/RegAfterPreClose.java
! test/java/nio/channels/Selector/SelectAndCancel.java
! test/java/nio/channels/Selector/SelectorLimit.java
! test/java/nio/channels/Selector/SelectorTest.java
! test/java/nio/channels/Selector/WakeupNow.java
! test/java/nio/channels/Selector/WakeupOverflow.java
! test/java/nio/channels/Selector/WakeupSpeed.java
- test/java/nio/channels/ServerSocketChannel/AcceptAddress.java
! test/java/nio/channels/SocketChannel/AdaptSocket.java
! test/java/nio/channels/SocketChannel/Bind.java
! test/java/nio/channels/SocketChannel/Close.java
! test/java/nio/channels/SocketChannel/CloseRegisteredChannel.java
! test/java/nio/channels/SocketChannel/CloseTimeoutChannel.java
! test/java/nio/channels/SocketChannel/IsConnectable.java
! test/java/nio/channels/SocketChannel/LocalAddress.java
! test/java/nio/channels/SocketChannel/SocketInheritance.java
! test/java/nio/channels/SocketChannel/Trivial.java
! test/java/nio/channels/SocketChannel/UnboundSocketTests.java
! test/java/nio/channels/etc/Shadow.java
! test/java/nio/channels/spi/SelectorProvider/inheritedChannel/ClosedStreams.java
! test/sun/nio/ch/Basic.java
! test/sun/nio/ch/TempBuffer.java
! test/sun/nio/cs/ReadZero.java
! test/sun/nio/cs/Test4206507.java
! test/sun/nio/cs/TestStringCoding.java

Changeset: 55aa27b8bb98
Author:    alanb
Date:      2010-06-23 21:22 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/55aa27b8bb98

Merge