merge-update from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / model / AbstractUtility.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
index 2ea0a5d6a4d58e0b1567eb178de9fd9ea02283f2..e335480a8e2e36e7c27b8e75f65ad902ced113ca 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
@@ -386,7 +386,7 @@ public abstract class AbstractUtility {
 
                        private String getCauseRecursively(Throwable t) {
                                if(t == null){
-                                       return null;
+                                       return "";
                                }
 
                                if(t.getCause() != null){
@@ -452,7 +452,7 @@ public abstract class AbstractUtility {
         *
         * @param operation
         *            a
-        *            {@link eu.etaxonomy.taxeditor.operation.AbstractPostOperation}
+        *            {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation}
         *            object.
         * @return a {@link org.eclipse.core.runtime.IStatus} object.
         */