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/11/10 16:45:00 UTC
svn commit: r1033534 - in /harmony/enhanced/java/branches/java6: ./
classlib/ classlib/depends/libs/ classlib/modules/beans/main/ drlvm/
jdktools/
Author: hindessm
Date: Wed Nov 10 15:44:59 2010
New Revision: 1033534
URL: http://svn.apache.org/viewvc?rev=1033534&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@1029773:
r1029773 | hindessm | 2010-11-01 17:58:53 +0000 (Mon, 01 Nov 2010) | 11 lines
Remove directory that was created (inadvertently?) in commit r1022963:
r1022963 | zhoukevin | 2010-10-15 16:17:01 +0100 (Fri, 15 Oct 2010) | 2 lines
For objects of types generated by methods of java.util.Collections class,
like java.util.Collections$UnmodifiableCollection generated by
java.util.Collections.unmodifiableCollection(Collection) method etc,
HARMONY has problem to encode and decode them while Oracle JDK doesn't.
This patch also adds several test cases to reproduce those problems.
Removed:
harmony/enhanced/java/branches/java6/classlib/modules/beans/main/
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/drlvm/ (props changed)
harmony/enhanced/java/branches/java6/jdktools/ (props changed)
Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 15:44:59 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-1029636
+/harmony/enhanced/java/trunk:929253-1029636,1029773
/harmony/enhanced/trunk:476395-929252
/incubator/harmony/enhanced/trunk:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 15:44:59 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-1029636
+/harmony/enhanced/java/trunk/classlib:929253-1029636,1029773
/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 Nov 10 15:44:59 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-1029636
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-1029636,1029773
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 15:44:59 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-1029636
+/harmony/enhanced/java/trunk/drlvm:929253-1029636,1029773
/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 Nov 10 15:44:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-1029636
+/harmony/enhanced/java/trunk/jdktools:929253-1029636,1029773
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147