You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2015/03/31 23:41:46 UTC
svn commit: r1670489 - in /sis/branches/JDK6: ./
core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
Author: desruisseaux
Date: Tue Mar 31 21:41:45 2015
New Revision: 1670489
URL: http://svn.apache.org/r1670489
Log:
Fix an AssertionError.
Modified:
sis/branches/JDK6/ (props changed)
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 31 21:41:45 2015
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
-/sis/branches/JDK7:1394913-1670481
-/sis/branches/JDK8:1584960-1670477
+/sis/branches/JDK7:1394913-1670488
+/sis/branches/JDK8:1584960-1670486
/sis/trunk:1394364-1508466,1519089-1519674
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java?rev=1670489&r1=1670488&r2=1670489&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] Tue Mar 31 21:41:45 2015
@@ -133,7 +133,7 @@ abstract class ResourceInternationalStri
return false;
}
final ResourceInternationalString that = (ResourceInternationalString) object;
- return (key == that.key) && (hasArguments == that.hasArguments) && Objects.equals(arguments, that.arguments);
+ return (key == that.key) && (hasArguments == that.hasArguments) && Objects.deepEquals(arguments, that.arguments);
}
/**