Fix ressource leak

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / main / java / org / argeo / slc / core / execution / FileExecutionResources.java

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/FileExecutionResources.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/FileExecutionResources.java
index c85455ba9095ba7714e404d29639f7f2310b3b75..d225cd193fd87df74aa9c977a15b9fde2d3a45eb 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/FileExecutionResources.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/FileExecutionResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
@@ -39,12 +40,14 @@ public class FileExecutionResources implements ExecutionResources {
        public final static String DEFAULT_EXECUTION_RESOURCES_TMP_PATH = System
                        .getProperty("java.io.tmpdir")
                        + File.separator
+                       + System.getProperty("user.name")
+                       + File.separator
                        + "slc"
                        + File.separator + DEFAULT_EXECUTION_RESOURCES_DIRNAME;
 
        private File baseDir;
        private ExecutionContext executionContext;
-       private String prefixDatePattern = "yyyyMMdd_HHmmss_";
+       private String prefixDatePattern = "yyMMdd_HHmmss_SSS";
        private SimpleDateFormat sdf = null;
 
        private Boolean withExecutionSubdirectory = true;
@@ -168,13 +171,12 @@ public class FileExecutionResources implements ExecutionResources {
 
        public File getWritableBaseDir() {
                if (withExecutionSubdirectory) {
+                       Date executionContextCreationDate = (Date) executionContext
+                                       .getVariable(ExecutionContext.VAR_EXECUTION_CONTEXT_CREATION_DATE);
                        Assert.notNull(executionContext, "execution context is null");
-                       String path = baseDir.getPath()
-                                       + File.separator
-                                       + sdf().format(
-                                                       executionContext
-                                                                       .getVariable(ExecutionContext.VAR_EXECUTION_CONTEXT_CREATION_DATE))
-                                       + executionContext.getUuid();
+                       String path = baseDir.getPath() + File.separator
+                                       + sdf().format(executionContextCreationDate);
+                       // TODO write execution id somewhere? like in a txt file
                        return new File(path);
                } else {
                        return baseDir;