sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1724593 - in /sis/branches/JDK6: ./ core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
Date Thu, 14 Jan 2016 11:54:49 GMT
Author: desruisseaux
Date: Thu Jan 14 11:54:49 2016
New Revision: 1724593

URL: http://svn.apache.org/viewvc?rev=1724593&view=rev
Log:
Merge bug fix from the JDK7 branch.

Modified:
    sis/branches/JDK6/   (props changed)
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java

Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 14 11:54:49 2016
@@ -1,4 +1,4 @@
 /sis/branches/Android:1430670-1480699
-/sis/branches/JDK7:1394913-1724479
-/sis/branches/JDK8:1584960-1724474
+/sis/branches/JDK7:1394913-1724592
+/sis/branches/JDK8:1584960-1724583
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1724593&r1=1724592&r2=1724593&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] Thu Jan 14 11:54:49 2016
@@ -328,10 +328,10 @@ public class ImmutableIdentifier extends
          * risk of false code space.
          */
         value = properties.get(CODESPACE_KEY);
-        if (value == null && !properties.containsKey(CODESPACE_KEY)) {
+        if (value == null) {
             codeSpace = org.apache.sis.internal.util.Citations.getCodeSpace(authority);
-        } else if (value instanceof String) {
-            codeSpace = trimWhitespaces((String) value);
+        } else if (value instanceof CharSequence) {
+            codeSpace = trimWhitespaces((CharSequence) value).toString();
         } else {
             throw illegalPropertyType(properties, CODESPACE_KEY, value);
         }



Mime
View raw message