[jboss-cvs] JBoss Messaging SVN: r5588 - 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 18:50:00 -0500 (Tue, 06 Jan 2009)
New Revision: 5588

Modified:
   trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java
Log:
tweaks

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 22:18:52 UTC (rev 5587)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java	2009-01-06 23:50:00 UTC (rev 5588)
@@ -61,9 +61,12 @@
  */
 public class PagingStoreFactoryNIO implements PagingStoreFactory
 {
+
    // Constants -----------------------------------------------------
    private static final Logger log = Logger.getLogger(PagingStoreFactoryNIO.class);
 
+   private static final String ADDRESS_FILE = "address.txt";
+
    // Attributes ----------------------------------------------------
 
    private final String directory;
@@ -135,17 +138,20 @@
 
       factory.createDirs();
 
-      File fileWithID = new File(directory + File.separatorChar + guid + File.separatorChar + "Address.txt");
+      File fileWithID = new File(directory + File.separatorChar + guid + File.separatorChar + ADDRESS_FILE);
 
-      OutputStream dataOut = new FileOutputStream(fileWithID);
+      BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(fileWithID)));
 
-      BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(dataOut));
+      try
+      {
+         writer.write(destinationName.toString());
+         writer.newLine();
+      }
+      finally
+      {
+         writer.close();
+      }
 
-      writer.write(destinationName.toString());
-      writer.newLine();
-
-      writer.close();
-
       return factory;
    }
 
@@ -184,20 +190,28 @@
 
             final String guid = file.getName();
             
-            final File addressFile = new File(file, "Address.txt");
+            final File addressFile = new File(file, ADDRESS_FILE);
 
             if (!addressFile.exists())
             {
-               log.warn("File " + file.toString() + " is missing Address.txt");
+               log.warn("Directory " + file.toString() + " didn't have an identification file " + ADDRESS_FILE);
                continue;
             }
 
             BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(addressFile)));
 
-            String destination = reader.readLine();
+            String destination;
+            
+            try
+            {
+               destination = reader.readLine();
+               reader.close();
+            }
+            finally
+            {
+               reader.close();
+            }
 
-            reader.close();
-
             SimpleString destinationName = new SimpleString(destination);
 
             SequentialFileFactory factory = newFileFactory(guid);