From 75679449edc2b85713333197cc5b1f9d27861462 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Thu, 21 May 2015 09:43:34 +1000 Subject: [PATCH] rhbz1082840 - make HTextFlowTarget toString method more robust --- .../main/java/org/zanata/model/HTextFlowTarget.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 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 index 3754804b56..ce95bcab76 100644 --- 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(); }