← Back to branch summary

~pbeaman/akiban-persistit/fix-1126297-longer-briefwait

« back to all changes in this revision

Viewing changes to src/main/java/com/persistit/Persistit.java

merge pbeaman: Fixes bug in which a IT record was written to the journal for a tree in the temporary lock volume.

https://code.launchpad.net/~pbeaman/akiban-persistit/fix-1125603-lock-tree-in-journal/+merge/148755

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/java/com/persistit/Persistit.java
1640
1640
                }
1641
1641
            }
1642
1642
            recordBufferPoolInventory();
1643
 
 
1644
1643
            _cleanupManager.close(flush);
1645
1644
            waitForIOTaskStop(_cleanupManager);
1646
1645
 
1647
1646
            getTransaction().close();
1648
1647
            cleanup();
1649
1648
 
 
1649
            if (_lockVolume != null) {
 
1650
                _lockVolume.close();
 
1651
            }
 
1652
 
1650
1653
            final List<Volume> volumes;
1651
1654
            synchronized (this) {
1652
1655
                volumes = new ArrayList<Volume>(_volumes);