Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

57087: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56572: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56395: MNT-9724: ImageMagick convert.exe: unable to create temporary file
             Added setup of MAGICK_TMPDIR to the ImageMagickContentTransformerWorker executer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 19:24:29 +00:00
parent 69811b41dc
commit 85eae4b91b

View File

@@ -28,6 +28,7 @@ import org.alfresco.service.cmr.repository.ContentIOException;
import org.alfresco.service.cmr.repository.CropSourceOptions;
import org.alfresco.service.cmr.repository.PagedSourceOptions;
import org.alfresco.service.cmr.repository.TransformationOptions;
import org.alfresco.util.TempFileProvider;
import org.alfresco.util.exec.RuntimeExec;
import org.alfresco.util.exec.RuntimeExec.ExecutionResult;
import org.apache.commons.logging.Log;
@@ -82,6 +83,8 @@ public class ImageMagickContentTransformerWorker extends AbstractImageMagickCont
*/
public void setExecuter(RuntimeExec executer)
{
executer.setProcessProperty(
"MAGICK_TMPDIR", TempFileProvider.getTempDir().getAbsolutePath());
this.executer = executer;
}