[exo-jcr-commits] exo-jcr SVN: r2383 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core.

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2010-05-17 03:09:01 -0400 (Mon, 17 May 2010)
New Revision: 2383

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java
Log:
EXOJCR-729 : The SpoolFile was used in SysViewWorkspaceInitializer.

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java	2010-05-17 06:56:21 UTC (rev 2382)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java	2010-05-17 07:09:01 UTC (rev 2383)
@@ -43,6 +43,7 @@
 import org.exoplatform.services.jcr.impl.dataflow.persistent.CacheableWorkspaceDataManager;
 import org.exoplatform.services.jcr.impl.util.JCRDateFormat;
 import org.exoplatform.services.jcr.impl.util.io.FileCleaner;
+import org.exoplatform.services.jcr.impl.util.io.SpoolFile;
 import org.exoplatform.services.jcr.storage.WorkspaceDataContainer;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
@@ -102,6 +103,8 @@
 
    protected String restorePath;
 
+   private final File tempDir;
+
    protected class TempOutputStream extends ByteArrayOutputStream
    {
 
@@ -252,7 +255,7 @@
          {
             if (buffer.length >= maxBufferSize)
             {
-               buff = new FileOutputStream(tmpFile = File.createTempFile("jcrrestorewi", ".tmp"));
+               buff = new FileOutputStream(tmpFile = SpoolFile.createTempFile("jcrrestorewi", ".tmp", tempDir));
             }
             else
             {
@@ -262,7 +265,7 @@
          else if (tmpFile == null && (((TempOutputStream)buff).getSize() + buffer.length) > maxBufferSize)
          {
             // spool to file
-            FileOutputStream fout = new FileOutputStream(tmpFile = File.createTempFile("jcrrestorewi", ".tmp"));
+            FileOutputStream fout = new FileOutputStream(tmpFile = SpoolFile.createTempFile("jcrrestorewi", ".tmp", tempDir));
             fout.write(((TempOutputStream)buff).getBuffer());
             buff.close();
             buff = fout; // use file
@@ -406,6 +409,8 @@
          throw new RepositoryConfigurationException("Workspace (" + workspaceName
             + ") RestoreIntializer should have mandatory parameter "
             + SysViewWorkspaceInitializer.RESTORE_PATH_PARAMETER);
+      
+      this.tempDir = new File(System.getProperty("java.io.tmpdir"));
    }
 
    /**
@@ -450,6 +455,8 @@
          config.getContainer().getParameterInteger(WorkspaceDataContainer.MAXBUFFERSIZE_PROP,
             WorkspaceDataContainer.DEF_MAXBUFFERSIZE);
       this.restorePath = restorePath;
+      
+      this.tempDir = new File(System.getProperty("java.io.tmpdir"));
    }
 
    /**
@@ -764,6 +771,7 @@
                            }
                            else
                            {
+                              
                               File pfile = propertyValue.getFile();
                               if (pfile != null)
                               {