sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1495622 - in /sis/branches/JDK7: ./ core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java
Date Fri, 21 Jun 2013 22:17:54 GMT
Author: desruisseaux
Date: Fri Jun 21 22:17:54 2013
New Revision: 1495622

URL: http://svn.apache.org/r1495622
Log:
SVN merge info, and post-merge fix.

Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
  Merged /sis/trunk:r1493767-1495611
  Merged /sis/branches/JDK6:r1493769-1495616

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java?rev=1495622&r1=1495621&r2=1495622&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java [UTF-8]
(original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java [UTF-8]
Fri Jun 21 22:17:54 2013
@@ -339,7 +339,7 @@ abstract class Pooled {
                 final String[] substitutes = new String[2];
                 if ((bitMasks & Context.SUBSTITUTE_LANGUAGE) != 0) substitutes[n++] =
"language";
                 if ((bitMasks & Context.SUBSTITUTE_COUNTRY)  != 0) substitutes[n++] =
"country";
-                return ArraysExt.resize(substitutes, n);
+                return (n != 0) ? ArraysExt.resize(substitutes, n) : null;
             }
             default: {
                 return getStandardProperty(convertPropertyKey(name));



Mime
View raw message