AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-10 07:45:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

use ByteBuffer to deal with transferFrom

Browse Source 
transferFrom giving us grief on some platforms (openjdk for arch and debian)
ByteBuffer appears to be more reliable

closes #3038
closes #3031
This commit is contained in:
payonel 2019-02-03 19:51:38 -08:00
parent 04a1fb77c9
commit c67f700fa9
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/scala/li/cil/oc/server/fs/Buffered.scala
View File

@ -2,6 +2,7 @@ package li.cil.oc.server.fs
import java.io import java.io
import java.io.FileNotFoundException import java.io.FileNotFoundException
import java.nio.ByteBuffer
import java.util.concurrent.CancellationException import java.util.concurrent.CancellationException
import java.util.concurrent.Future import java.util.concurrent.Future
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@ -131,7 +132,19 @@ trait Buffered extends OutputStreamFileSystem {
childFile.createNewFile() childFile.createNewFile()
val out = new io.FileOutputStream(childFile).getChannel val out = new io.FileOutputStream(childFile).getChannel
val in = openInputChannel(childPath).get val in = openInputChannel(childPath).get
out.transferFrom(in, 0, Long.MaxValue)
val buffer = ByteBuffer.allocateDirect(16 * 1024)
while (in.read(buffer) != -1) {
buffer.flip()
out.write(buffer)
buffer.compact()
}
buffer.flip()
while (buffer.hasRemaining) {
out.write(buffer)
}
out.close() out.close()
in.close() in.close()
childFile.setLastModified(time) childFile.setLastModified(time)