Merge
authormullan
Fri, 21 Oct 2016 09:03:35 -0400
changeset 41604 95f4b6dbc5c9
parent 41603 bb9d97b4c21b (current diff)
parent 41602 56443be12e8e (diff)
child 41605 290923d3b566
Merge
--- a/jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c	Fri Oct 21 09:02:57 2016 -0400
+++ b/jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c	Fri Oct 21 09:03:35 2016 -0400
@@ -627,11 +627,12 @@
             (*env)->SetObjectArrayElement(env, bindsArr, bind_index++, ibObj);
         } else /* AF_INET6 */ {
             int scope;
+            jboolean ret;
             iaObj = (*env)->NewObject(env, ia6_class, ia6_ctrID);
             if (iaObj == NULL) {
                 return NULL;
             }
-            jboolean ret = setInet6Address_ipaddress(env, iaObj, (jbyte *)&(addrs->addr.sa6.sin6_addr.s6_addr));
+            ret = setInet6Address_ipaddress(env, iaObj, (jbyte *)&(addrs->addr.sa6.sin6_addr.s6_addr));
             if (ret == JNI_FALSE) {
                 return NULL;
             }