rhbz1082840 - make HTextFlowTarget toString method more robust

zanata · May 21, 2015 · 7567944 · 7567944
1 parent 0d56ed3
commit 7567944
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java b/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
@@ -395,9 +395,16 @@ public HTextFlowTargetReviewComment addReviewComment(String comment,
 
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(this).add("contents", getContents())
-                .add("locale", getLocale()).add("state", getState())
-                .add("comment", getComment())
+        MoreObjects.ToStringHelper helper =
+                MoreObjects.toStringHelper(this)
+                        .add("contents", getContents())
+                        .add("locale", getLocale())
+                        .add("state", getState())
+                        .add("comment", getComment());
+        if (getTextFlow() == null) {
+            return helper.toString();
+        }
+        return helper
                 .add("textFlow", getTextFlow().getContents()).toString();
     }