changeset 6714:5acb9e506858

8021899: Re-adjust fix of # 8020498 in 7u45 after mergeing 7u40 Reviewed-by: chegar
author asaha
date Tue, 30 Jul 2013 10:20:57 -0700
parents 4c6eb1390566
children 0547d262d086
files src/share/native/java/net/net_util.c
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/java/net/net_util.c	Mon Jul 29 12:00:10 2013 -0700
+++ b/src/share/native/java/net/net_util.c	Tue Jul 30 10:20:57 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -102,7 +102,7 @@
 jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) {
     jobject holder;
 
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
     CHECK_NULL_RETURN(holder, NULL);
     return (*env)->GetObjectField(env, holder, ia6_scopeifnameID);
@@ -111,7 +111,7 @@
 int setInet6Address_scopeifname(JNIEnv *env, jobject iaObj, jobject scopeifname) {
     jobject holder;
 
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
     CHECK_NULL_RETURN(holder, JNI_FALSE);
     (*env)->SetObjectField(env, holder, ia6_scopeifnameID, scopeifname);
@@ -121,7 +121,7 @@
 int getInet6Address_scopeifname_set(JNIEnv *env, jobject iaObj) {
     jobject holder;
 
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
     CHECK_NULL_RETURN(holder, -1);
     return (*env)->GetBooleanField(env, holder, ia6_scopeifnamesetID);
@@ -130,7 +130,7 @@
 int setInet6Address_scopeifname_set(JNIEnv *env, jobject iaObj, int scopeifname_set) {
     jobject holder;
 
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
     CHECK_NULL_RETURN(holder, JNI_FALSE);
     (*env)->SetBooleanField(env, holder, ia6_scopeifnamesetID, scopeifname_set);
@@ -140,7 +140,7 @@
 int getInet6Address_scopeid_set(JNIEnv *env, jobject iaObj) {
     jobject holder;
 
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
     CHECK_NULL_RETURN(holder, -1);
     return (*env)->GetBooleanField(env, holder, ia6_scopeidsetID);
@@ -149,7 +149,7 @@
 int getInet6Address_scopeid(JNIEnv *env, jobject iaObj) {
     jobject holder;
 
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
     CHECK_NULL_RETURN(holder, -1);
     return (*env)->GetIntField(env, holder, ia6_scopeidID);
@@ -158,7 +158,7 @@
 int setInet6Address_scopeid(JNIEnv *env, jobject iaObj, int scopeid) {
     jobject holder;
 
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
     CHECK_NULL_RETURN(holder, JNI_FALSE);
     (*env)->SetIntField(env, holder, ia6_scopeidID, scopeid);
@@ -173,7 +173,7 @@
     jobject holder, addr;
     jbyteArray barr;
 
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
     CHECK_NULL_RETURN(holder, JNI_FALSE);
     addr =  (*env)->GetObjectField(env, holder, ia6_ipaddressID);
@@ -186,7 +186,7 @@
     jobject holder;
     jbyteArray addr;
 
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
     CHECK_NULL_RETURN(holder, JNI_FALSE);
     addr =  (jbyteArray)(*env)->GetObjectField(env, holder, ia6_ipaddressID);