You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/07/21 09:23:34 UTC
svn commit: r966120 - in /harmony/enhanced/java/branches/java6: ./ classlib/
classlib/depends/libs/ classlib/modules/luni/src/main/java/java/io/
classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/
classlib/modules/portlib/s...
Author: hindessm
Date: Wed Jul 21 07:23:34 2010
New Revision: 966120
URL: http://svn.apache.org/viewvc?rev=966120&view=rev
Log:
Merge changes from trunk@966093.
Modified:
harmony/enhanced/java/branches/java6/ (props changed)
harmony/enhanced/java/branches/java6/classlib/ (props changed)
harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/PipedOutputStream.java
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedOutputStreamTest.java
harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/a2e/unix/atoe.c
harmony/enhanced/java/branches/java6/drlvm/ (props changed)
harmony/enhanced/java/branches/java6/jdktools/ (props changed)
Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 07:23:34 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-965825
+/harmony/enhanced/java/trunk:929253-966093
/harmony/enhanced/trunk:476395-929252
/incubator/harmony/enhanced/trunk:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 07:23:34 2010
@@ -1,7 +1,7 @@
/harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
/harmony/enhanced/classlib/trunk/working_classlib:884014-884286
/harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-965825
+/harmony/enhanced/java/trunk/classlib:929253-966093
/harmony/enhanced/trunk/classlib:476395-929252
/harmony/enhanced/trunk/working_classlib:476396-920147
/incubator/harmony/enhanced/trunk/classlib:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 07:23:34 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-965825
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-966093
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/PipedOutputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/PipedOutputStream.java?rev=966120&r1=966119&r2=966120&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/PipedOutputStream.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/PipedOutputStream.java Wed Jul 21 07:23:34 2010
@@ -147,10 +147,6 @@ public class PipedOutputStream extends O
*/
@Override
public void write(byte buffer[], int offset, int count) throws IOException {
- if (dest == null) {
- // luni.D1=Pipe Not Connected
- throw new IOException(Messages.getString("luni.D1")); //$NON-NLS-1$
- }
super.write(buffer, offset, count);
}
Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedOutputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedOutputStreamTest.java?rev=966120&r1=966119&r2=966120&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedOutputStreamTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedOutputStreamTest.java Wed Jul 21 07:23:34 2010
@@ -183,6 +183,30 @@ public class PipedOutputStreamTest exten
} catch (NullPointerException e) {
// expected
}
+
+ pis = new PipedInputStream();
+ pos = new PipedOutputStream(pis);
+ pos.close();
+ pos.write(new byte[0], 0, 0);
+
+ try {
+ pis = new PipedInputStream();
+ pos = new PipedOutputStream(pis);
+ pos.write(new byte[0], -1, 0);
+ fail("IndexOutOfBoundsException expected");
+ } catch (IndexOutOfBoundsException t) {
+ //expected
+ }
+
+ try {
+ pis = new PipedInputStream();
+ pos = new PipedOutputStream(pis);
+ pos.write(null, -10, 0);
+ fail("should throw NullPointerException.");
+ } catch (NullPointerException e) {
+ // expected
+ }
+
}
/**
Modified: harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/a2e/unix/atoe.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/a2e/unix/atoe.c?rev=966120&r1=966119&r2=966120&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/a2e/unix/atoe.c (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/a2e/unix/atoe.c Wed Jul 21 07:23:34 2010
@@ -2092,7 +2092,7 @@ atoe_execvp (const char *file, char *con
free(ebcdicArgv[i]);
}
free(ebcdicArgv);
- free(ebcdicPath);
+ free(ebcdicFile);
return rc;
}
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 07:23:34 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-965825
+/harmony/enhanced/java/trunk/drlvm:929253-966093
/harmony/enhanced/trunk/drlvm:476395-929252
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/drlvm:292550-476394
Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 07:23:34 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-965825
+/harmony/enhanced/java/trunk/jdktools:929253-966093
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147