src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c

rev 15720 : 8166850: No runtime error expected after calling NET_MapSocketOption

*** 1,7 ****
  /*
!  * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 367,388 ****
  /*
   * Class:     java_net_DualStackPlainSocketImpl
   * Method:    setIntOption
   * Signature: (III)V
   */
! JNIEXPORT void JNICALL Java_java_net_DualStackPlainSocketImpl_setIntOption
!   (JNIEnv *env, jclass clazz, jint fd, jint cmd, jint value) {
! 
      int level = 0, opt = 0;
      struct linger linger = {0, 0};
      char *parg;
      int arglen;
  
      if (NET_MapSocketOption(cmd, &level, &opt) < 0) {
!         JNU_ThrowByNameWithLastError(env,
!                                      JNU_JAVANETPKG "SocketException",
!                                      "Invalid option");
          return;
      }
  
      if (opt == java_net_SocketOptions_SO_LINGER) {
          parg = (char *)&linger;
--- 367,387 ----
  /*
   * Class:     java_net_DualStackPlainSocketImpl
   * Method:    setIntOption
   * Signature: (III)V
   */
! JNIEXPORT void JNICALL
! Java_java_net_DualStackPlainSocketImpl_setIntOption
!   (JNIEnv *env, jclass clazz, jint fd, jint cmd, jint value)
! {
      int level = 0, opt = 0;
      struct linger linger = {0, 0};
      char *parg;
      int arglen;
  
      if (NET_MapSocketOption(cmd, &level, &opt) < 0) {
!         JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
          return;
      }
  
      if (opt == java_net_SocketOptions_SO_LINGER) {
          parg = (char *)&linger;
*** 408,429 ****
   * Class:     java_net_DualStackPlainSocketImpl
   * Method:    getIntOption
   * Signature: (II)I
   */
  JNIEXPORT jint JNICALL Java_java_net_DualStackPlainSocketImpl_getIntOption
!   (JNIEnv *env, jclass clazz, jint fd, jint cmd) {
! 
      int level = 0, opt = 0;
      int result=0;
      struct linger linger = {0, 0};
      char *arg;
      int arglen;
  
      if (NET_MapSocketOption(cmd, &level, &opt) < 0) {
!         JNU_ThrowByNameWithLastError(env,
!                                      JNU_JAVANETPKG "SocketException",
!                                      "Unsupported socket option");
          return -1;
      }
  
      if (opt == java_net_SocketOptions_SO_LINGER) {
          arg = (char *)&linger;
--- 407,426 ----
   * Class:     java_net_DualStackPlainSocketImpl
   * Method:    getIntOption
   * Signature: (II)I
   */
  JNIEXPORT jint JNICALL Java_java_net_DualStackPlainSocketImpl_getIntOption
!   (JNIEnv *env, jclass clazz, jint fd, jint cmd)
! {
      int level = 0, opt = 0;
      int result=0;
      struct linger linger = {0, 0};
      char *arg;
      int arglen;
  
      if (NET_MapSocketOption(cmd, &level, &opt) < 0) {
!         JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
          return -1;
      }
  
      if (opt == java_net_SocketOptions_SO_LINGER) {
          arg = (char *)&linger;