Skip to content

Close the previous assigned input in MessageBufferInput#reset #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xerial merged 1 commit into from
Jan 11, 2015
Merged

Close the previous assigned input in MessageBufferInput#reset #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/core/buffer/ChannelBufferInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public ChannelBufferInput(ReadableByteChannel channel, int bufferSize) {
}

public void reset(ReadableByteChannel channel) throws IOException {
channel.close();
this.channel.close();
this.channel = channel;
this.reachedEOF = false;
}
Expand Down
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/core/buffer/InputStreamBufferInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public InputStreamBufferInput(InputStream in, int bufferSize) {
}

public void reset(InputStream in) throws IOException {
in.close();
this.in.close();
this.in = in;
reachedEOF = false;
}
Expand Down
53 changes: 52 additions & 1 deletion msgpack-core/src/test/scala/org/msgpack/core/buffer/MessageBufferInputTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package org.msgpack.core.buffer

import org.msgpack.core.MessagePackSpec
import org.msgpack.core.{MessageUnpacker, MessagePack, MessagePackSpec}
import java.io._
import xerial.core.io.IOUtil
import scala.util.Random
import java.util.zip.{GZIPOutputStream, GZIPInputStream}
import java.nio.ByteBuffer
import org.msgpack.unpacker.MessagePackUnpacker

/**
* Created on 5/30/14.
Expand Down Expand Up @@ -98,4 +99,54 @@ class MessageBufferInputTest extends MessagePackSpec {
}

}

def createTempFile = {
val f = File.createTempFile("msgpackTest", "msgpack")
f.deleteOnExit
f
}

def createTempFileWithInputStream = {
val f = createTempFile
val out = new FileOutputStream(f)
new MessagePack().newPacker(out).packInt(42).close
val in = new FileInputStream(f)
(f, in)
}

def createTempFileWithChannel = {
val (f, in) = createTempFileWithInputStream
val ch = in.getChannel
(f, ch)
}

def readInt(buf:MessageBufferInput) : Int = {
val unpacker = new MessageUnpacker(buf)
unpacker.unpackInt
}

"InputStreamBufferInput" should {
"reset buffer" in {
val (f0, in0) = createTempFileWithInputStream
val buf = new InputStreamBufferInput(in0)
readInt(buf) shouldBe 42

val (f1, in1) = createTempFileWithInputStream
buf.reset(in1)
readInt(buf) shouldBe 42
}
}

"ChannelBufferInput" should {
"reset buffer" in {
val (f0, in0) = createTempFileWithChannel
val buf = new ChannelBufferInput(in0)
readInt(buf) shouldBe 42

val (f1, in1) = createTempFileWithChannel
buf.reset(in1)
readInt(buf) shouldBe 42
}
}

}