[jboss-cvs] JBossAS SVN: r97831 - trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/file.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2009-12-15 00:45:19 -0500 (Tue, 15 Dec 2009)
New Revision: 97831

Modified:
   trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/file/AddContentStreamAction.java
Log:
[JBAS-7546] Farming's AddContentStreamAction should not close stream

Modified: trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/file/AddContentStreamAction.java
===================================================================
--- trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/file/AddContentStreamAction.java	2009-12-15 05:33:16 UTC (rev 97830)
+++ trunk/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/file/AddContentStreamAction.java	2009-12-15 05:45:19 UTC (rev 97831)
@@ -104,98 +104,9 @@
    {
       return log;
    }
+   
+   // ----------------------------------------------------------------  Private
 
-   @Override
-   protected void doCancel()
-   {
-      try
-      {
-         super.doCancel();
-      }
-      finally
-      {
-         safeCloseStream();
-      }
-   }
-
-   @Override
-   protected void doCommit()
-   {
-      try
-      {
-         super.doCommit();
-      }
-      finally
-      {
-         safeCloseStream();
-      }
-   }
-
-   @Override
-   protected void doComplete() throws Exception
-   {
-      try
-      {
-         super.doComplete();
-      }
-      finally
-      {
-         safeCloseStream();
-      }
-   }
-
-   @Override
-   protected boolean doPrepare()
-   {
-      try
-      {
-         return super.doPrepare();
-      }
-      finally
-      {
-         safeCloseStream();
-      }
-   }
-
-   @Override
-   protected void doRollbackFromCancelled()
-   {
-      try
-      {
-         super.doRollbackFromCancelled();
-      }
-      finally
-      {
-         safeCloseStream();
-      }
-   }
-
-   @Override
-   protected void doRollbackFromOpen()
-   {
-      try
-      {
-         super.doRollbackFromOpen();
-      }
-      finally
-      {
-         safeCloseStream();
-      }
-   }
-
-   @Override
-   protected void doRollbackFromRollbackOnly()
-   {
-      try
-      {
-         super.doRollbackFromRollbackOnly();
-      }
-      finally
-      {
-         safeCloseStream();
-      }
-   }
-
    private synchronized InputStream getInputStream() throws IOException
    {
       State s = getState();
@@ -205,22 +116,5 @@
       }
       return stream;
    }
-   
-   private synchronized void safeCloseStream()
-   {
-      synchronized (stream)
-      {
-         try
-         {
-            stream.close();
-         }
-         catch (IOException e)
-         {
-            ContentModification mod = getRepositoryContentModification();
-            log.debug("Caught exception closing stream for " + mod.getRootName() + 
-                  " " + mod.getItem().getRelativePath(), e);
-         }
-      }
-   }
 
 }