[jboss-svn-commits] JBL Code SVN: r37843 - labs/jbosstm/branches/JBOSSTS_4_16/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore.

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

Author: jhalliday
Date: 2012-01-11 06:55:58 -0500 (Wed, 11 Jan 2012)
New Revision: 37843

Modified:
   labs/jbosstm/branches/JBOSSTS_4_16/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
Log:
fix exception use in FileSystemStore.closeAndUnlock  JBTM-1012


Modified: labs/jbosstm/branches/JBOSSTS_4_16/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java	2012-01-11 10:40:38 UTC (rev 37842)
+++ labs/jbosstm/branches/JBOSSTS_4_16/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java	2012-01-11 11:55:58 UTC (rev 37843)
@@ -339,7 +339,15 @@
         {
             if (ifile != null)
                 ifile.close();
-            else
+        }
+        catch (Exception e)
+        {
+            closedOk = false;
+        }
+
+        try
+        {
+            if (ofile != null)
                 ofile.close();
         }
         catch (Exception e)
@@ -766,7 +774,7 @@
     protected volatile boolean doSync = true;
 
     // global values (some of which may be reset on a per instance basis).
-    
+
     private static Hashtable fileCache = new Hashtable();
     private static int       createRetry = 100;
     private static int       createTimeout = 100;