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/09/13 11:26:11 UTC
svn commit: r996463 - in /harmony/enhanced/java/branches/java6: ./ classlib/
classlib/depends/libs/
classlib/support/src/test/java/tests/support/Support_NetworkInterface.java
drlvm/ jdktools/
Author: hindessm
Date: Mon Sep 13 09:26:11 2010
New Revision: 996463
URL: http://svn.apache.org/viewvc?rev=996463&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@996457:
r996457 | hindessm | 2010-09-13 10:12:54 +0100 (Mon, 13 Sep 2010) | 3 lines
Applying patch from "[#HARMONY-6647]
[classlib][luni]MulticastSocketTest.test_joinGroupLjava_net_SocketAddressLj
ava_net_NetworkInterface failure on windows due to non-real interfaces".
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/support/src/test/java/tests/support/Support_NetworkInterface.java
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 Mon Sep 13 09:26:11 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-996210
+/harmony/enhanced/java/trunk:929253-996210,996457
/harmony/enhanced/trunk:476395-929252
/incubator/harmony/enhanced/trunk:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 13 09:26:11 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-996210
+/harmony/enhanced/java/trunk/classlib:929253-996210,996457
/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 Mon Sep 13 09:26:11 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210,996457
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Modified: harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/support/Support_NetworkInterface.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/support/Support_NetworkInterface.java?rev=996463&r1=996462&r2=996463&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/support/Support_NetworkInterface.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/support/Support_NetworkInterface.java Mon Sep 13 09:26:11 2010
@@ -38,7 +38,8 @@ public class Support_NetworkInterface {
|| (theInterface.getDisplayName()
.equals("Automatic Tunneling Pseudo-Interface"))
|| (theInterface.getDisplayName()
- .equals("Loopback Pseudo-Interface"))) {
+ .equals("Loopback Pseudo-Interface"))
+ || (theInterface.getDisplayName().equals("MS TCP Loopback interface"))) {
result = false;
}
}
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 13 09:26:11 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-996210
+/harmony/enhanced/java/trunk/drlvm:929253-996210,996457
/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 Mon Sep 13 09:26:11 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-996210
+/harmony/enhanced/java/trunk/jdktools:929253-996210,996457
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147