changeset 4675:61c4a65004c1

7126979: (props) JCK test java_lang/System/GetProperties.java failing [macosx] Reviewed-by: skovatch
author michaelm
date Tue, 24 Jan 2012 16:18:59 +0000
parents 67f1abd35c4e
children 6b4f3fb8e218 0bb5eee1fa7f
files src/share/native/java/lang/System.c src/solaris/native/java/lang/java_props_macosx.c
diffstat 2 files changed, 0 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/java/lang/System.c	Tue Jan 24 16:15:42 2012 +0000
+++ b/src/share/native/java/lang/System.c	Tue Jan 24 16:18:59 2012 +0000
@@ -165,10 +165,6 @@
     return NULL;
 }
 
-#ifdef MACOSX
-extern void freeProps(java_props_t *sProps);
-#endif
-
 JNIEXPORT jobject JNICALL
 Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
 {
@@ -395,10 +391,6 @@
         (*env)->DeleteLocalRef(env, jVMVal);
     }
 
-#ifdef MACOSX
-    // Free malloced memory.
-    freeProps(sprops);
-#endif
     return ret;
 }
 
--- a/src/solaris/native/java/lang/java_props_macosx.c	Tue Jan 24 16:15:42 2012 +0000
+++ b/src/solaris/native/java/lang/java_props_macosx.c	Tue Jan 24 16:18:59 2012 +0000
@@ -348,37 +348,3 @@
 
     CFRelease(dict);
 }
-
-
-void freeProps(java_props_t *sprops) {
-    if (sprops->httpProxyEnabled) {
-        free(sprops->httpHost);
-        free(sprops->httpPort);
-    }
-
-    if (sprops->httpsProxyEnabled) {
-        free(sprops->httpsHost);
-        free(sprops->httpsPort);
-    }
-
-    if (sprops->ftpProxyEnabled) {
-        free(sprops->ftpHost);
-        free(sprops->ftpPort);
-    }
-
-    if (sprops->socksProxyEnabled) {
-        free(sprops->socksHost);
-        free(sprops->socksPort);
-    }
-
-    if (sprops->gopherProxyEnabled) {
-        free(sprops->gopherHost);
-        free(sprops->gopherPort);
-    }
-    if (sprops->exceptionList) {
-        free(sprops->exceptionList);
-    }
-
-    free(sprops->os_name);
-    free(sprops->os_version);
-}