[jboss-cvs] JBoss Messaging SVN: r7131 - in branches/Branch_JBM2_Perf_Clebert: tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2009-05-29 14:39:33 -0400 (Fri, 29 May 2009)
New Revision: 7131

Modified:
   branches/Branch_JBM2_Perf_Clebert/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
   branches/Branch_JBM2_Perf_Clebert/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFile.java
   branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
Log:
Fixing some tests

Modified: branches/Branch_JBM2_Perf_Clebert/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- branches/Branch_JBM2_Perf_Clebert/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-05-29 12:02:53 UTC (rev 7130)
+++ branches/Branch_JBM2_Perf_Clebert/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-05-29 18:39:33 UTC (rev 7131)
@@ -1842,9 +1842,10 @@
    private JournalFile appendRecord(final ByteBuffer bb, final boolean sync, final TransactionCallback callback) throws Exception
    {
       lock.acquire();
-      
-      // TOOD: when we add the timer on AIO, we need to make sure this routine locks buffered timer somehow, as the offSet verification can't happen in the middle of the buffered timer
 
+      // TOOD: when we add the timer on AIO, we need to make sure this routine locks buffered timer somehow, as the
+      // offSet verification can't happen in the middle of the buffered timer
+
       try
       {
          if (state != STATE_LOADED)

Modified: branches/Branch_JBM2_Perf_Clebert/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFile.java
===================================================================
--- branches/Branch_JBM2_Perf_Clebert/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFile.java	2009-05-29 12:02:53 UTC (rev 7130)
+++ branches/Branch_JBM2_Perf_Clebert/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFile.java	2009-05-29 18:39:33 UTC (rev 7131)
@@ -23,7 +23,6 @@
 package org.jboss.messaging.core.journal.impl;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;

Modified: branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
===================================================================
--- branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java	2009-05-29 12:02:53 UTC (rev 7130)
+++ branches/Branch_JBM2_Perf_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java	2009-05-29 18:39:33 UTC (rev 7131)
@@ -567,8 +567,7 @@
        */
       public boolean fits(int size)
       {
-         // TODO Auto-generated method stub
-         return false;
+         return data.position() + size < data.limit();
       }
 
    }