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 2014/08/25 12:13:56 UTC
svn commit: r1620290 - in /sis/branches/JDK7: ./
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java
Author: desruisseaux
Date: Mon Aug 25 10:13:55 2014
New Revision: 1620290
URL: http://svn.apache.org/r1620290
Log:
Merged the NullPointerException fix.
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
Merged /sis/branches/JDK8:r1617765-1620289
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java?rev=1620290&r1=1620289&r2=1620290&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java [UTF-8] Mon Aug 25 10:13:55 2014
@@ -21,7 +21,6 @@ import java.util.Iterator;
import org.opengis.metadata.citation.Telephone;
import org.opengis.metadata.citation.TelephoneType;
import org.apache.sis.internal.metadata.LegacyPropertyAdapter;
-import org.apache.sis.util.ArgumentChecks;
/**
@@ -99,7 +98,9 @@ final class LegacyTelephones extends Leg
*/
@Override
public boolean add(final String value) {
- ArgumentChecks.ensureNonNull("value", value);
+ if (value == null || value.isEmpty()) { // Null value happen with empty XML elements like <gco:CharacterString/>
+ return false;
+ }
final Iterator<Telephone> it = elements.iterator();
if (it.hasNext()) {
final Telephone telephone = it.next();