From e4b0014b881a836f0709490d02aece2c7bd0067c Mon Sep 17 00:00:00 2001 From: paweldomas Date: Fri, 22 Mar 2013 11:41:26 +0000 Subject: [PATCH] Applied part of the patch submitted by Carl Hasselskog on dev list. Fixed a NullPointerException that occurred for instance when an SSLSocket called getTcpNoDelay() on PseudoTCPSocket. PseudoTcpSocketImpl returned null but the SSLSocket assumed it would be true/false. Improved logging to better detect if someone is trying to get some other option that would return null. --- src/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java b/src/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java index d59088c..6657606 100755 --- a/src/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java +++ b/src/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java @@ -268,7 +268,18 @@ class PseudoTcpSocketImpl throws SocketException { //TODO: map options to PTCP options/method calls - return options.get(optID); + if(optID == SocketOptions.TCP_NODELAY) + { + Object ret = options.get(Option.OPT_NODELAY.ordinal()); + return ret != null; + } + + Object option = options.get(optID); + if(option == null) + { + logger.warning("Asked for unknown optID" + optID); + } + return option; } public long getPTCPOption(Option opt)