Skip to content

Allow disabling SO_LINGER on java.net.Socket #1088

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
merged 1 commit into from
Mar 21, 2019
Merged

Allow disabling SO_LINGER on java.net.Socket #1088

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
8 changes: 4 additions & 4 deletions ...rc/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixJavaNetSubstitutions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5636,8 +5636,6 @@ void socketSetOption(int cmd, boolean on, Object value) throws SocketException {
case SocketOptions.SO_LINGER:
case SocketOptions.IP_TOS:
{
/* Accessing values of java.lang.Integer the easy way. */
Integer valueInteger = (Integer) value;
// 934 jclass cls;
// 935 jfieldID fid;
// 936
Expand All @@ -5653,7 +5651,8 @@ void socketSetOption(int cmd, boolean on, Object value) throws SocketException {
// 944 optval.ling.l_onoff = 1;
((Socket.linger) optval_Pointer).set_l_onoff(1);
// 945 optval.ling.l_linger = (*env)->GetIntField(env, value, fid);
((Socket.linger) optval_Pointer).set_l_linger(valueInteger.intValue());
int valueAsInt = ((Integer)value).intValue();
((Socket.linger) optval_Pointer).set_l_linger(valueAsInt);
} else {
// 947 optval.ling.l_onoff = 0;
((Socket.linger) optval_Pointer).set_l_onoff(0);
Expand All @@ -5666,7 +5665,8 @@ void socketSetOption(int cmd, boolean on, Object value) throws SocketException {
LibC.memcpy(optval_Pointer, optval_Pointer, WordFactory.unsigned(optlen));
} else {
// 952 optval.i = (*env)->GetIntField(env, value, fid);
((CIntPointer) optval_Pointer).write(valueInteger.intValue());
int valueAsInt = ((Integer)value).intValue();
((CIntPointer) optval_Pointer).write(valueAsInt);
// 953 optlen = sizeof(optval.i);
optlen = SizeOf.get(CIntPointer.class);
/* Copy to optval. */
Expand Down