jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c

rev 5725 : Merge

*** 44,55 ****
  #include "nio.h"
  #include "nio_util.h"
  
  #include "sun_nio_ch_DatagramChannelImpl.h"
  
- static jfieldID isa_addrID;     /* address in java.net.InetSocketAddress */
- static jfieldID isa_portID;     /* port in java.net.InetSocketAddress */
  static jfieldID dci_senderID;   /* sender in sun.nio.ch.DatagramChannelImpl */
  static jfieldID dci_senderAddrID; /* sender InetAddress in sun.nio.ch.DatagramChannelImpl */
  static jfieldID dci_senderPortID; /* sender port in sun.nio.ch.DatagramChannelImpl */
  static jclass isa_class;        /* java.net.InetSocketAddress */
  static jmethodID isa_ctorID;    /*   .InetSocketAddress(InetAddress, int) */
--- 44,53 ----
*** 59,71 ****
  {
      clazz = (*env)->FindClass(env, "java/net/InetSocketAddress");
      isa_class = (*env)->NewGlobalRef(env, clazz);
      isa_ctorID = (*env)->GetMethodID(env, clazz, "<init>",
                                       "(Ljava/net/InetAddress;I)V");
-     isa_addrID = (*env)->GetFieldID(env, clazz, "addr",
-                                     "Ljava/net/InetAddress;");
-     isa_portID = (*env)->GetFieldID(env, clazz, "port", "I");
  
      clazz = (*env)->FindClass(env, "sun/nio/ch/DatagramChannelImpl");
      dci_senderID = (*env)->GetFieldID(env, clazz, "sender",
                                        "Ljava/net/SocketAddress;");
      dci_senderAddrID = (*env)->GetFieldID(env, clazz,
--- 57,66 ----
*** 210,228 ****
  }
  
  JNIEXPORT jint JNICALL
  Java_sun_nio_ch_DatagramChannelImpl_send0(JNIEnv *env, jobject this,
                                            jboolean preferIPv6, jobject fdo, jlong address,
!                                             jint len, jobject dest)
  {
      jint fd = fdval(env, fdo);
      void *buf = (void *)jlong_to_ptr(address);
      SOCKADDR sa;
      int sa_len = SOCKADDR_LEN;
      jint n = 0;
-     jobject destAddress = (*env)->GetObjectField(env, dest, isa_addrID);
-     jint destPort = (*env)->GetIntField(env, dest, isa_portID);
  
      if (len > MAX_PACKET_LEN) {
          len = MAX_PACKET_LEN;
      }
  
--- 205,221 ----
  }
  
  JNIEXPORT jint JNICALL
  Java_sun_nio_ch_DatagramChannelImpl_send0(JNIEnv *env, jobject this,
                                            jboolean preferIPv6, jobject fdo, jlong address,
!                                           jint len, jobject destAddress, jint destPort)
  {
      jint fd = fdval(env, fdo);
      void *buf = (void *)jlong_to_ptr(address);
      SOCKADDR sa;
      int sa_len = SOCKADDR_LEN;
      jint n = 0;
  
      if (len > MAX_PACKET_LEN) {
          len = MAX_PACKET_LEN;
      }