sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1724583 - in /sis/branches/JDK8/core: sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
Date Thu, 14 Jan 2016 11:15:45 GMT
Author: desruisseaux
Date: Thu Jan 14 11:15:45 2016
New Revision: 1724583

URL: http://svn.apache.org/viewvc?rev=1724583&view=rev
Log:
Minor bug fixes identified as a result of the merge.

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1724583&r1=1724582&r2=1724583&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] Thu Jan 14 11:15:45 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);
         }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java?rev=1724583&r1=1724582&r2=1724583&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] Thu Jan 14 11:15:45 2016
@@ -2100,7 +2100,7 @@ addURIs:    for (int i=0; ; i++) {
      * Returns the name and description for the specified {@link CoordinateSystemAxis} code.
      * Many axes share the same name and description, so it is worth to cache them.
      */
-    private AxisName getAxisName(final Integer code) throws FactoryException {
+    private AxisName getAxisName(final Integer code) throws FactoryException, SQLException
{
         assert Thread.holdsLock(this);
         AxisName returnValue = axisNames.get(code);
         if (returnValue == null) {
@@ -2121,8 +2121,6 @@ addURIs:    for (int i=0; ; i++) {
                     final AxisName axis = new AxisName(name, description);
                     returnValue = ensureSingleton(axis, returnValue, code);
                 }
-            } catch (SQLException exception) {
-                throw databaseFailure(AxisName.class, code, exception);
             }
             if (returnValue == null) {
                 throw noSuchAuthorityCode(AxisName.class, String.valueOf(code));



Mime
View raw message