Skip to content

Commit

Permalink
Fixes compilation issues from last merge
Browse files Browse the repository at this point in the history
  • Loading branch information
digitalstain committed Feb 2, 2017
1 parent 4ed618a commit dce8854
Showing 1 changed file with 3 additions and 3 deletions.
Expand Up @@ -37,7 +37,7 @@
import org.neo4j.causalclustering.core.state.machines.tx.ReplicatedTransaction; import org.neo4j.causalclustering.core.state.machines.tx.ReplicatedTransaction;
import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.causalclustering.identity.MemberId;
import org.neo4j.causalclustering.messaging.CoreReplicatedContentMarshal; import org.neo4j.causalclustering.messaging.CoreReplicatedContentMarshal;
import org.neo4j.io.fs.StoreFileChannel; import org.neo4j.io.fs.StoreChannel;
import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.store.id.IdType;
import org.neo4j.logging.LogProvider; import org.neo4j.logging.LogProvider;
import org.neo4j.test.OnDemandJobScheduler; import org.neo4j.test.OnDemandJobScheduler;
Expand Down Expand Up @@ -168,7 +168,7 @@ public void shouldNotAppendAtTheEndOfLogFileWithIncompleteEntries() throws Throw
State recoveryState = recovery.run(); State recoveryState = recovery.run();
String logFilename = recoveryState.segments.last().getFilename(); String logFilename = recoveryState.segments.last().getFilename();
File logFile = new File( logDirectory, logFilename ); File logFile = new File( logDirectory, logFilename );
StoreFileChannel lastFile = fsRule.get().open( logFile, "rw" ); StoreChannel lastFile = fsRule.get().open( logFile, "rw" );
long currentSize = lastFile.size(); long currentSize = lastFile.size();
lastFile.close(); lastFile.close();


Expand Down Expand Up @@ -208,7 +208,7 @@ public void shouldNotAppendAtTheEndOfLogFileWithIncompleteEntries() throws Throw
private void truncateAndRecover( File logFile, long truncateDownToSize ) private void truncateAndRecover( File logFile, long truncateDownToSize )
throws IOException, DamagedLogStorageException, DisposedException throws IOException, DamagedLogStorageException, DisposedException
{ {
StoreFileChannel lastFile = fsRule.get().open( logFile, "rw" ); StoreChannel lastFile = fsRule.get().open( logFile, "rw" );
long currentSize = lastFile.size(); long currentSize = lastFile.size();
lastFile.close(); lastFile.close();
RecoveryProtocol recovery; RecoveryProtocol recovery;
Expand Down

0 comments on commit dce8854

Please sign in to comment.