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

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

Author: mark.little at jboss.com
Date: 2009-11-04 16:44:58 -0500 (Wed, 04 Nov 2009)
New Revision: 29966

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
Log:
Check for directory in allObjUids.

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java	2009-11-04 21:09:46 UTC (rev 29965)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java	2009-11-04 21:44:58 UTC (rev 29966)
@@ -50,6 +50,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FilenameFilter;
 import java.io.IOException;
 
 import com.arjuna.common.util.logging.*;
@@ -80,6 +81,19 @@
 public abstract class FileSystemStore extends ObjectStore
 {
 
+    class FileFilter implements FilenameFilter
+    {
+        public boolean accept (File dir, String name)
+        {
+            File f = new File(name);
+            
+            if (f.isDirectory())
+                return false;
+            else
+                return true;
+        }       
+    }
+    
     public FileSystemStore (String locationOfStore, int ss)
     {
         super(ss);
@@ -234,7 +248,7 @@
             directory = new String(fullStoreName + tName);
 
         File f = new File(directory);
-        String[] entry = f.list();
+        String[] entry = f.list(new FileFilter()); // only return files not dirs
 
         if ((entry != null) && (entry.length > 0))
         {