SUGGESTED FIX
diff -r a301b69dfdc3 src/share/native/java/lang/System.c
--- a/src/share/native/java/lang/System.c Tue Jan 03 13:43:05 2012 -0800
+++ b/src/share/native/java/lang/System.c Wed Jan 04 06:39:55 2012 -0800
@@ -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;
}
diff -r a301b69dfdc3 src/solaris/native/java/lang/java_props_macosx.c
--- a/src/solaris/native/java/lang/java_props_macosx.c Tue Jan 03 13:43:05 2012 -0800
+++ b/src/solaris/native/java/lang/java_props_macosx.c Wed Jan 04 06:45:42 2012 -0800
@@ -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);
-}
|