[GeoNetwork-commit] SF.net SVN: geonetwork:[4280] sandbox/geocat.ch/trunk/src/org/fao/geonet/ services/reusable/KeywordsStrategy.java

[<jes...@us...>]

Revision: 4280
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=4280&view=rev
Author:   jesseeichar
Date:     2009-06-16 13:17:21 +0000 (Tue, 16 Jun 2009)

Log Message:
-----------
made more robust in the face of bad data

Modified Paths:
--------------
    sandbox/geocat.ch/trunk/src/org/fao/geonet/services/reusable/KeywordsStrategy.java

Modified: sandbox/geocat.ch/trunk/src/org/fao/geonet/services/reusable/KeywordsStrategy.java
===================================================================
--- sandbox/geocat.ch/trunk/src/org/fao/geonet/services/reusable/KeywordsStrategy.java	2009-06-16 13:14:48 UTC (rev 4279)
+++ sandbox/geocat.ch/trunk/src/org/fao/geonet/services/reusable/KeywordsStrategy.java	2009-06-16 13:17:21 UTC (rev 4280)
@@ -257,8 +257,11 @@
         String code = UUID.randomUUID().toString();
 
         URI uri = doUpdateKeyword(originalElem, nonValidThesaurusName, code, metadataLang, false);
-
-        return Collections.singleton(xlinkIt(ThesaurusManager.NON_VALID_THESAURUS_NAME, uri.toString(),false));
+        if( uri==null ){
+            return Collections.emptyList();
+        }else{
+            return Collections.singleton(xlinkIt(ThesaurusManager.NON_VALID_THESAURUS_NAME, uri.toString(),false));
+        }
     }
 
     private URI doUpdateKeyword(Element originalElem, String nonValidThesaurusName, String code, String metadataLang, boolean update) throws Exception,
@@ -272,7 +275,7 @@
         for (Element keywordElement : xml) {
             String keyword = keywordElement.getTextTrim();
             String locale = keywordElement.getAttributeValue("locale");
-            if( locale==null ){
+            if( locale==null || locale.trim().length() < 2 ){
                 locale = metadataLang;
             }else{
                 locale = locale.toLowerCase();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.