From 63d14dfb203381d095bde851efd40a1340638b55 Mon Sep 17 00:00:00 2001 From: "Carlos A. Munoz" Date: Fri, 15 Nov 2013 15:45:14 +1000 Subject: [PATCH] rhbz1030732 - Change copy trans to load document entity within the spawned transaction. --- .../java/org/zanata/service/impl/CopyTransServiceImpl.java | 7 ++++--- .../org/zanata/service/impl/CopyTransServiceImplTest.java | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java index 0e7a344e8a..8d541f2671 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java @@ -123,10 +123,10 @@ private String createComment(HTextFlowTarget target) { @Override public void copyTransForLocale(HDocument document, HLocale locale) { - this.copyTransForLocale(document, locale, new HCopyTransOptions()); + this.copyTransForLocale(document.getId(), locale, new HCopyTransOptions()); } - public void copyTransForLocale(final HDocument document, + public void copyTransForLocale(final Long documentId, final HLocale locale, final HCopyTransOptions options) { try { new Work() { @@ -136,6 +136,7 @@ protected Void work() throws Exception { boolean checkContext = false, checkProject = false, checkDocument = false; + HDocument document = documentDAO.findById(documentId); boolean requireTranslationReview = document.getProjectIteration() .getRequireTranslationReview(); @@ -433,7 +434,7 @@ public void copyTransForDocument(HDocument document, if (taskHandleOpt.isPresent() && taskHandleOpt.get().isCancelled()) { return; } - copyTransForLocale(document, locale, copyTransOpts); + copyTransForLocale(document.getId(), locale, copyTransOpts); } if (taskHandleOpt.isPresent()) { diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java index db496ee623..287416d1a4 100644 --- a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java +++ b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java @@ -341,8 +341,7 @@ public void testCopyTrans(CopyTransExecution execution) { new HCopyTransOptions(execution.getContextMismatchAction(), execution.getDocumentMismatchAction(), execution.getProjectMismatchAction()); - CopyTransService copyTransService = seam// .use("asynchronousProcessHandle", - // handle) + CopyTransService copyTransService = seam .autowire(CopyTransServiceImpl.class); copyTransService.copyTransForIteration(projectIteration, options);