Skip to content

MessageBufferOutput#reset shouldn't close an output passed as a paramete... #169

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 3 commits into from
Jan 11, 2015
Merged

MessageBufferOutput#reset shouldn't close an output passed as a paramete... #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a872ec2
MessageBufferOutput#reset shouldn't close an output passed as a param…
komamitsu Jan 10, 2015
2423c4b
Close the previous output in MessageBufferOutput#reset
komamitsu Jan 11, 2015
51e83af
Remove tempfiles on exit
komamitsu Jan 11, 2015
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/ChannelBufferOutput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public ChannelBufferOutput(WritableByteChannel channel) {
}

public void reset(WritableByteChannel channel) throws IOException {
channel.close();
this.channel.close();

@xerial xerial Jan 11, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code should be:

this.channel.close();

this.channel = channel;
}

Expand Down
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/core/buffer/OutputStreamBufferOutput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public OutputStreamBufferOutput(OutputStream out) {
}

public void reset(OutputStream out) throws IOException {
out.close();
this.out.close();

@xerial xerial Jan 11, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have been:

this.out.close();

this.out = out;
}

Expand Down
61 changes: 61 additions & 0 deletions msgpack-core/src/test/scala/org/msgpack/core/buffer/MessageBufferOutputTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package org.msgpack.core.buffer

import org.msgpack.core.MessagePackSpec
import java.io._

class MessageBufferOutputTest extends MessagePackSpec {

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

def createTempFileWithOutputStream = {
val f = createTempFile
val out = new FileOutputStream(f)
(f, out)
}

def createTempFileWithChannel = {
val (f, out) = createTempFileWithOutputStream
val ch = out.getChannel
(f, ch)
}

def writeIntToBuf(buf:MessageBufferOutput) = {
val mb0 = buf.next(8)
mb0.putInt(0, 42)
buf.flush(mb0)
buf.close
}

"OutputStreamBufferOutput" should {
"reset buffer" in {
val (f0, out0) = createTempFileWithOutputStream
val buf = new OutputStreamBufferOutput(out0)
writeIntToBuf(buf)
f0.length.toInt should be > 0

val (f1, out1) = createTempFileWithOutputStream
buf.reset(out1)
writeIntToBuf(buf)
f1.length.toInt should be > 0
}
}

"ChannelBufferOutput" should {
"reset buffer" in {
val (f0, ch0) = createTempFileWithChannel
val buf = new ChannelBufferOutput(ch0)
writeIntToBuf(buf)
f0.length.toInt should be > 0

val (f1, ch1) = createTempFileWithChannel
buf.reset(ch1)
writeIntToBuf(buf)
f1.length.toInt should be > 0
}
}

}