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

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

Author: clebert.suconic at jboss.com
Date: 2009-03-09 21:20:06 -0400 (Mon, 09 Mar 2009)
New Revision: 6053

Removed:
   trunk/src/main/org/jboss/messaging/core/journal/impl/TransactionHolder.java
Modified:
   trunk/src/main/org/jboss/messaging/core/journal/SequentialFileFactory.java
   trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
Log:
Journal tweaks

Modified: trunk/src/main/org/jboss/messaging/core/journal/SequentialFileFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/SequentialFileFactory.java	2009-03-09 22:59:21 UTC (rev 6052)
+++ trunk/src/main/org/jboss/messaging/core/journal/SequentialFileFactory.java	2009-03-10 01:20:06 UTC (rev 6053)
@@ -50,9 +50,6 @@
 
    int calculateBlockSize(int bytes);
 
-   /** This method is not being used currently. 
-    *  The journal will complete the buffer when reusing the buffer.
-    *  Look at JournalImpl#newBuffer for more information about this */
    void clearBuffer(ByteBuffer buffer);
    
    /** 

Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-03-09 22:59:21 UTC (rev 6052)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-03-10 01:20:06 UTC (rev 6053)
@@ -2619,15 +2619,8 @@
    private class ByteArrayEncoding implements EncodingSupport
    {
 
-      // Constants -----------------------------------------------------
       final byte[] data;
 
-      // Attributes ----------------------------------------------------
-
-      // Static --------------------------------------------------------
-
-      // Constructors --------------------------------------------------
-
       public ByteArrayEncoding(final byte[] data)
       {
          this.data = data;
@@ -2649,16 +2642,31 @@
       {
          return data.length;
       }
+   }
+   
+   
+   // Used on Load
+   private static class TransactionHolder
+   {
+      public TransactionHolder(final long id)
+      {
+         transactionID = id;
+      }
 
-      // Package protected ---------------------------------------------
+      public final long transactionID;
 
-      // Protected -----------------------------------------------------
+      public final List<RecordInfo> recordInfos = new ArrayList<RecordInfo>();
 
-      // Private -------------------------------------------------------
+      public final List<RecordInfo> recordsToDelete = new ArrayList<RecordInfo>();
 
-      // Inner classes -------------------------------------------------
+      public boolean prepared;
 
+      public boolean invalid;
+
+      public byte[] extraData;
+
    }
 
 
+
 }

Deleted: trunk/src/main/org/jboss/messaging/core/journal/impl/TransactionHolder.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/TransactionHolder.java	2009-03-09 22:59:21 UTC (rev 6052)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/TransactionHolder.java	2009-03-10 01:20:06 UTC (rev 6053)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.messaging.core.journal.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.messaging.core.journal.RecordInfo;
-
-/**
- * 
- * A TransactionHolder
- * 
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- *
- */
-
-public class TransactionHolder
-{
-   public TransactionHolder(final long id)
-   {
-      transactionID = id;
-   }
-
-   public final long transactionID;
-
-   public final List<RecordInfo> recordInfos = new ArrayList<RecordInfo>();
-
-   public final List<RecordInfo> recordsToDelete = new ArrayList<RecordInfo>();
-
-   public boolean prepared;
-
-   public boolean invalid;
-
-   public byte[] extraData;
-
-}