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

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

Author: clebert.suconic at jboss.com
Date: 2009-06-17 01:09:47 -0400 (Wed, 17 Jun 2009)
New Revision: 7376

Modified:
   trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
Log:
tweaks from findBugs

Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-06-17 04:24:59 UTC (rev 7375)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-06-17 05:09:47 UTC (rev 7376)
@@ -208,6 +208,10 @@
                       final String fileExtension,
                       final int maxAIO)
    {
+      if (fileFactory == null)
+      {
+         throw new NullPointerException("fileFactory is null");
+      }
       if (fileSize < MIN_FILE_SIZE)
       {
          throw new IllegalArgumentException("File size cannot be less than " + MIN_FILE_SIZE + " bytes");
@@ -222,10 +226,6 @@
       {
          throw new IllegalArgumentException("minFiles cannot be less than 2");
       }
-      if (fileFactory == null)
-      {
-         throw new NullPointerException("fileFactory is null");
-      }
       if (filePrefix == null)
       {
          throw new NullPointerException("filePrefix is null");
@@ -850,8 +850,6 @@
                loadManager.addRecord(info);
 
                posFilesMap.put(info.id, new PosFiles(file));
-               
-               PosFiles file = posFilesMap.get(info.id);
             }
 
             public void updateRecord(RecordInfo info) throws Exception
@@ -2653,7 +2651,7 @@
 
    }
 
-   private class ByteArrayEncoding implements EncodingSupport
+   private static class ByteArrayEncoding implements EncodingSupport
    {
 
       final byte[] data;