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

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

Author: clebert.suconic at jboss.com
Date: 2009-06-27 23:00:49 -0400 (Sat, 27 Jun 2009)
New Revision: 7484

Modified:
   branches/clebert_temp_expirement/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
   branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalCompactTest.java
Log:
changes

Modified: branches/clebert_temp_expirement/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- branches/clebert_temp_expirement/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-06-26 22:56:53 UTC (rev 7483)
+++ branches/clebert_temp_expirement/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-06-28 03:00:49 UTC (rev 7484)
@@ -848,7 +848,7 @@
          {
             compactingLock.writeLock().unlock();
          }
-
+         
          // Read the files, and use the Compactor class to create the new outputFiles, and the new collections as well
          JournalFile previousFile = null;
          for (final JournalFile file : dataFilesToProcess)
@@ -875,6 +875,9 @@
          onCompactDone();
 
          SequentialFile controlFile = createControlFile(dataFilesToProcess, compactor.newDataFiles);
+         
+         
+         List<JournalFile> newDatafiles = null;
 
          compactingLock.writeLock().lock();
          try
@@ -883,24 +886,27 @@
             {
                records.put(newRecordEntry.getKey(), newRecordEntry.getValue());
             }
-
+            
             for (JournalFile data: compactor.newDataFiles)
             {
                dataFiles.addFirst(data);
             }
-            //dataFiles.add
             
             // Restore relationshipMap
             // Deal with transactions commits that happend during the compacting
             // Deal with updates and deletes that happened during the compacting
 
+            newDatafiles = compactor.newDataFiles;
+            
+            this.compactor = null;
+
          }
          finally
          {
             compactingLock.writeLock().unlock();
          }
 
-         renameFiles(dataFilesToProcess, compactor.newDataFiles);
+         renameFiles(dataFilesToProcess, newDatafiles);
          deleteControlFile(controlFile);
 
       }

Modified: branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalCompactTest.java
===================================================================
--- branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalCompactTest.java	2009-06-26 22:56:53 UTC (rev 7483)
+++ branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalCompactTest.java	2009-06-28 03:00:49 UTC (rev 7484)
@@ -183,6 +183,8 @@
       
       delete(0);
       add(idGenerator.generateID());
+      
+      journal.compact();
 
       stopJournal();
       createJournal();