ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-18 07:08:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

avoid passing null arguments to native methods in SocketChannel

Browse Source
This commit is contained in:
Joel Dice
2009-03-02 15:22:17 -07:00
parent 79a1d0451f
commit 8659c709b7
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
classpath/java/nio/channels/SocketChannel.java
View File

@ -57,6 +57,8 @@ public class SocketChannel extends SelectableChannel
} }
private int doConnect(String host, int port) throws Exception { private int doConnect(String host, int port) throws Exception {
if (host == null) throw new NullPointerException();
boolean b[] = new boolean[1]; boolean b[] = new boolean[1];
int s = natDoConnect(host, port, b); int s = natDoConnect(host, port, b);
connected = b[0]; connected = b[0];
@ -66,7 +68,11 @@ public class SocketChannel extends SelectableChannel
public int read(ByteBuffer b) throws IOException { public int read(ByteBuffer b) throws IOException {
if (! isOpen()) return -1; if (! isOpen()) return -1;
if (b.remaining() == 0) return 0; if (b.remaining() == 0) return 0;
int r = natRead(socket, b.array(), b.arrayOffset() + b.position(), b.remaining());
byte[] array = b.array();
if (array == null) throw new NullPointerException();
int r = natRead(socket, array, b.arrayOffset() + b.position(), b.remaining());
if (r > 0) { if (r > 0) {
b.position(b.position() + r); b.position(b.position() + r);
} }
@ -78,7 +84,11 @@ public class SocketChannel extends SelectableChannel
natThrowWriteError(socket); natThrowWriteError(socket);
} }
if (b.remaining() == 0) return 0; if (b.remaining() == 0) return 0;
int w = natWrite(socket, b.array(), b.arrayOffset() + b.position(), b.remaining());
byte[] array = b.array();
if (array == null) throw new NullPointerException();
int w = natWrite(socket, array, b.arrayOffset() + b.position(), b.remaining());
if (w > 0) { if (w > 0) {
b.position(b.position() + w); b.position(b.position() + w);
} }