From b34da27fbd1b6decb93cf4bf06ddbe0c8498fdb5 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 10 Nov 2013 17:12:52 -0500 Subject: [PATCH] Fix an unclosed closeable. --- src/com/limelight/nvstream/NvVideoStream.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/com/limelight/nvstream/NvVideoStream.java b/src/com/limelight/nvstream/NvVideoStream.java index 686303ad..321095be 100644 --- a/src/com/limelight/nvstream/NvVideoStream.java +++ b/src/com/limelight/nvstream/NvVideoStream.java @@ -6,7 +6,6 @@ import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.Socket; import java.net.SocketException; -import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.util.LinkedList; import java.util.concurrent.LinkedBlockingQueue; @@ -82,18 +81,14 @@ public class NvVideoStream { { depacketizer.trim(); } - - private InputStream openFirstFrameInputStream(String host) throws UnknownHostException, IOException - { - Socket s = new Socket(host, FIRST_FRAME_PORT); - return s.getInputStream(); - } - + private void readFirstFrame(String host) throws IOException { byte[] firstFrame = depacketizer.allocatePacketBuffer(); + Socket s = new Socket(host, FIRST_FRAME_PORT); + System.out.println("VID: Waiting for first frame"); - InputStream firstFrameStream = openFirstFrameInputStream(host); + InputStream firstFrameStream = s.getInputStream(); int offset = 0; for (;;) @@ -106,6 +101,8 @@ public class NvVideoStream { offset += bytesRead; } + s.close(); + System.out.println("VID: First frame read ("+offset+" bytes)"); depacketizer.addInputData(new AvVideoPacket(new AvByteBufferDescriptor(firstFrame, 0, offset)));