Merge remote-tracking branch 'origin/integration/master' into kerbero…

…s-form-fallback
zanata · Nov 12, 2013 · e2812b1 · e2812b1
2 parents 2e954a8 + c7650a0
commit e2812b1
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
@@ -20,6 +20,7 @@
  */
 package org.zanata.service.impl;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -628,6 +629,7 @@ protected Boolean work() throws Exception {
 
                         for (TextFlowTarget incomingTarget : batch) {
                             String resId = incomingTarget.getResId();
+//                            String sourceHash = incomingTarget.getSourceHash();
                             HTextFlow textFlow =
                                     textFlowDAO.getById(document, resId);
                             if (textFlow == null) {
@@ -640,6 +642,19 @@ protected Boolean work() throws Exception {
                                 log.warn(
                                         "skipping TextFlowTarget with unknown resId: {}",
                                         resId);
+//                            } else if (sourceHash != null && !sourceHash.equals(textFlow.getContentHash())) {
+//                                String warning = MessageFormat.format(
+//                                        "TextFlowTarget {0} may be obsolete; "
+//                                                + "associated source hash: {1}; "
+//                                                + "expected hash is {2} for source: {3}",
+//                                                resId,
+//                                                sourceHash,
+//                                                textFlow.getContentHash(),
+//                                                textFlow.getContents());
+//                                warnings.add(warning);
+//                                log.warn(
+//                                        "skipping TextFlowTarget {} with unknown sourceHash: {}",
+//                                        resId, sourceHash);
                             } else {
                                 String validationMessage =
                                         validateTranslations(