[jboss-cvs] JBoss Messaging SVN: r5587 - trunk/src/main/org/jboss/messaging/core/paging/impl.

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

Author: clebert.suconic at jboss.com
Date: 2009-01-06 17:18:52 -0500 (Tue, 06 Jan 2009)
New Revision: 5587

Modified:
   trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java
Log:
some tweaks on the address file

Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java	2009-01-06 21:25:44 UTC (rev 5586)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java	2009-01-06 22:18:52 UTC (rev 5587)
@@ -27,11 +27,9 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FilenameFilter;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -68,8 +66,6 @@
 
    // Attributes ----------------------------------------------------
 
-   private final DecimalFormat format = new DecimalFormat("000000000");
-
    private final String directory;
 
    private final ExecutorService parentExecutor;
@@ -93,7 +89,7 @@
       this.directory = directory;
 
       parentExecutor = Executors.newFixedThreadPool(maxThreads, new JBMThreadFactory("JBM-depaging-threads"));
-   
+
       executorFactory = new OrderedExecutorFactory(parentExecutor);
 
       globalDepagerExecutor = executorFactory.getExecutor();
@@ -125,33 +121,31 @@
                                  settings,
                                  executorFactory.getExecutor());
    }
-   
+
    /**
     * @param storeName
     * @return
     */
-   public synchronized SequentialFileFactory newFileFactory(SimpleString destinationName) throws Exception
+   public synchronized SequentialFileFactory newFileFactory(final SimpleString destinationName) throws Exception
    {
-      
+
       String guid = UUIDGenerator.getInstance().generateStringUUID();
-      
-      File fileWithID = new File(directory + File.separatorChar +  guid + ".pg");
-      
+
+      SequentialFileFactory factory = newFileFactory(guid);
+
+      factory.createDirs();
+
+      File fileWithID = new File(directory + File.separatorChar + guid + File.separatorChar + "Address.txt");
+
       OutputStream dataOut = new FileOutputStream(fileWithID);
-      
+
       BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(dataOut));
-      
+
       writer.write(destinationName.toString());
       writer.newLine();
-      writer.write(guid);
-      writer.newLine();
-      
+
       writer.close();
-      
-      SequentialFileFactory factory = newFileFactory(guid);
-      
-      factory.createDirs();
-      
+
       return factory;
    }
 
@@ -174,17 +168,8 @@
    {
       File pageDirectory = new File(directory);
 
+      File[] files = pageDirectory.listFiles();
 
-      FilenameFilter fnf = new FilenameFilter()
-      {
-         public boolean accept(File file, String name)
-         {
-            return name.endsWith(".pg");
-         }
-      };
-
-      File[] files = pageDirectory.listFiles(fnf);
-
       if (files == null)
       {
          return Collections.<PagingStore> emptyList();
@@ -193,27 +178,30 @@
       else
       {
          ArrayList<PagingStore> storesReturn = new ArrayList<PagingStore>(files.length);
-         
-         for (File file: files)
+
+         for (File file : files)
          {
+
+            final String guid = file.getName();
             
-            BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
-            
-            String destination = reader.readLine();
-            String guid = reader.readLine();
-            
-            reader.close();
-            
-            if (destination == null || guid == null)
+            final File addressFile = new File(file, "Address.txt");
+
+            if (!addressFile.exists())
             {
-               log.warn("File " + file.toString() + " is missing properties");
+               log.warn("File " + file.toString() + " is missing Address.txt");
                continue;
             }
-            
+
+            BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(addressFile)));
+
+            String destination = reader.readLine();
+
+            reader.close();
+
             SimpleString destinationName = new SimpleString(destination);
-            
+
             SequentialFileFactory factory = newFileFactory(guid);
-            
+
             QueueSettings settings = queueSettingsRepository.getMatch(destinationName.toString());
 
             PagingStore store = new PagingStoreImpl(pagingManager,
@@ -224,7 +212,7 @@
                                                     destinationName,
                                                     settings,
                                                     executorFactory.getExecutor());
-            
+
             storesReturn.add(store);
          }