You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/04/21 13:53:16 UTC
svn commit: r395863 - in
/incubator/harmony/enhanced/classlib/trunk/modules/nio: make/common/build.xml
src/test/java/org/apache/harmony/tests/java/nio/channels/ServerSocketChannelTest.java
Author: tellison
Date: Fri Apr 21 04:53:08 2006
New Revision: 395863
URL: http://svn.apache.org/viewcvs?rev=395863&view=rev
Log:
Apply patch HARMONY-351 (java.nio.channels.ServerSocketChannelTest is broken)
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/ServerSocketChannelTest.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml?rev=395863&r1=395862&r2=395863&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml Fri Apr 21 04:53:08 2006
@@ -96,7 +96,6 @@
<batchtest todir="${hy.tests.reports}" haltonfailure="no">
<fileset dir="${hy.nio.src.test.java}">
<include name="**/*Test.java"/>
- <exclude name="**/ServerSocketChannelTest.java"/>
</fileset>
</batchtest>
</junit>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/ServerSocketChannelTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/ServerSocketChannelTest.java?rev=395863&r1=395862&r2=395863&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/ServerSocketChannelTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/ServerSocketChannelTest.java Fri Apr 21 04:53:08 2006
@@ -341,7 +341,7 @@
System.err.println("Client connect fail!"); //$NON-NLS-1$
} else {
ByteBuffer sendBuf = ByteBuffer.wrap(MSG_CLIENT.getBytes());
-
+ clientChannel.write(sendBuf);
Thread.currentThread().sleep(TIME_UNIT);
ByteBuffer receiveBuf = ByteBuffer.allocate(capacityNormal);
clientChannel.read(receiveBuf);