Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / occurrence / FieldUnit.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/FieldUnit.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/FieldUnit.java
index 05216b267e1ef3699e9e3f3cb793c0f01c8adaa2..19ea3811c80c439fbb8b73c1c38b9246a0e69cbc 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/FieldUnit.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/FieldUnit.java
@@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
@@ -40,11 +41,11 @@ import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
 import eu.etaxonomy.cdm.strategy.cache.common.IdentifiableEntityDefaultCacheStrategy;
 
 /**
- * 
+ *
  * In situ observation of a taxon in the field. If a specimen exists,
- * in most cases a parallel field unit object should be instantiated and the specimen then 
+ * in most cases a parallel field unit object should be instantiated and the specimen then
  * is "derived" from the field unit via derivation type "accessioning" or any other.
- * 
+ *
  * @author m.doering
  * @created 08-Nov-2007 13:06:40
  */
@@ -145,7 +146,7 @@ public class FieldUnit extends SpecimenOrObservationBase<IIdentifiableEntityCach
        }
 
        public void setFieldNumber(String fieldNumber) {
-               this.fieldNumber = fieldNumber;
+               this.fieldNumber = StringUtils.isBlank(fieldNumber)? null : fieldNumber;
        }
 
 
@@ -168,7 +169,7 @@ public class FieldUnit extends SpecimenOrObservationBase<IIdentifiableEntityCach
        }
 
        public void setFieldNotes(String fieldNotes) {
-               this.fieldNotes = fieldNotes;
+               this.fieldNotes = StringUtils.isBlank(fieldNotes)? null : fieldNotes;
        }
 
        // *********** Listener *****************************/