Merge lp:~pbeaman/akiban-persistit/java7-issues into lp:akiban-persistit
Proposed by
Peter Beaman
Status: | Merged |
---|---|
Approved by: | Peter Beaman |
Approved revision: | 414 |
Merged at revision: | 413 |
Proposed branch: | lp:~pbeaman/akiban-persistit/java7-issues |
Merge into: | lp:akiban-persistit |
Diff against target: |
86 lines (+8/-10) 3 files modified
src/main/java/com/persistit/Persistit.java (+7/-4) src/test/java/com/persistit/MediatedFileChannelTest.java (+1/-1) src/test/java/com/persistit/unit/UnitTestProperties.java (+0/-5) |
To merge this branch: | bzr merge lp:~pbeaman/akiban-persistit/java7-issues |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Akiban Build User | Needs Fixing | ||
Nathan Williams | Approve | ||
Review via email: mp+144285@code.launchpad.net |
Description of the change
Fixes a couple of issues that emerged while running unit tests under Java7 on Max OSX.
1. Due to a bug in the OSX version of the JDK, getLocalHost() is either broken or very slow. Since the RMI and JMX services are not used by unit tests, this branch simply removes them from the UnitTestProperties configurations.
2. FileChannel appears to have slightly different behavior when a write is interrupted, possibly leaving the write completed and the ByteBuffer empty. To compensate, MediatedFileCha
To post a comment you must log in.
Simple and point 2 sounds important.