[jboss-cvs] JBoss Messaging SVN: r4932 - in trunk/src/main/org/jboss/messaging/core/journal: impl and 1 other directory.

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

Author: timfox
Date: 2008-09-11 03:08:19 -0400 (Thu, 11 Sep 2008)
New Revision: 4932

Modified:
   trunk/src/main/org/jboss/messaging/core/journal/Journal.java
   trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
Log:
Changed parameter name to be more consistent


Modified: trunk/src/main/org/jboss/messaging/core/journal/Journal.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/Journal.java	2008-09-11 02:16:54 UTC (rev 4931)
+++ trunk/src/main/org/jboss/messaging/core/journal/Journal.java	2008-09-11 07:08:19 UTC (rev 4932)
@@ -51,7 +51,7 @@
    
    void appendUpdateRecordTransactional(long txID, long id, byte recordType, EncodingSupport record) throws Exception;
    
-   void appendDeleteRecordTransactional(long txID, long id, EncodingSupport extraData) throws Exception;
+   void appendDeleteRecordTransactional(long txID, long id, EncodingSupport record) throws Exception;
    
    void appendCommitRecord(long txID) throws Exception;
    

Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2008-09-11 02:16:54 UTC (rev 4931)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2008-09-11 07:08:19 UTC (rev 4932)
@@ -465,14 +465,14 @@
       }
    }
 
-   public void appendDeleteRecordTransactional(final long txID, final long id, final EncodingSupport extraData) throws Exception
+   public void appendDeleteRecordTransactional(final long txID, final long id, final EncodingSupport record) throws Exception
    {
       if (state != STATE_LOADED)
       {
          throw new IllegalStateException("Journal must be loaded first");
       }
       
-      int size = SIZE_DELETE_RECORD_TX + (extraData != null? extraData.getEncodeSize():0);
+      int size = SIZE_DELETE_RECORD_TX + (record != null? record.getEncodeSize():0);
       
       ByteBufferWrapper bb = new ByteBufferWrapper(newBuffer(size));
       
@@ -481,10 +481,10 @@
       bb.putInt(-1); // skip ID part
       bb.putLong(txID);    
       bb.putLong(id);
-      bb.putInt(extraData != null ? extraData.getEncodeSize() : 0);
-      if (extraData != null)
+      bb.putInt(record != null ? record.getEncodeSize() : 0);
+      if (record != null)
       {
-         extraData.encode(bb);
+         record.encode(bb);
       }
       bb.putInt(size);