Index: vm/vmcore/src/kernel_classes/native/java_lang_VMExecutionEngine.h =================================================================== --- vm/vmcore/src/kernel_classes/native/java_lang_VMExecutionEngine.h (revision 481162) +++ vm/vmcore/src/kernel_classes/native/java_lang_VMExecutionEngine.h (working copy) @@ -104,22 +104,6 @@ /* * Class: java_lang_VMExecutionEngine -* Method: getenv -* Signature: (Ljava/lang/String;)Ljava/lang/String; -*/ -JNIEXPORT jstring JNICALL Java_java_lang_VMExecutionEngine_getenv__Ljava_lang_String_2 -(JNIEnv *, jclass, jstring); - -/* -* Class: java_lang_VMExecutionEngine -* Method: getenv -* Signature: ()Ljava/util/Map; -*/ -JNIEXPORT jobject JNICALL Java_java_lang_VMExecutionEngine_getenv__ -(JNIEnv *, jclass); - -/* -* Class: java_lang_VMExecutionEngine * Method: mapLibraryName * Signature: (Ljava/lang/String;)Ljava/lang/String; */ Index: vm/vmcore/src/kernel_classes/native/java_lang_VMExecutionEngine.cpp =================================================================== --- vm/vmcore/src/kernel_classes/native/java_lang_VMExecutionEngine.cpp (revision 481162) +++ vm/vmcore/src/kernel_classes/native/java_lang_VMExecutionEngine.cpp (working copy) @@ -215,60 +215,6 @@ /* * Class: java_lang_VMExecutionEngine -* Method: getenv -* Signature: (Ljava/lang/String;)Ljava/lang/String; -*/ -JNIEXPORT jstring JNICALL Java_java_lang_VMExecutionEngine_getenv__Ljava_lang_String_2 -(JNIEnv *jenv, jclass, jstring jname) { - jstring res = NULL; - if(jname) { - const char* key = GetStringUTFChars(jenv, jname, NULL); - apr_pool_t *pp; - char* value; - if (APR_SUCCESS == apr_pool_create(&pp, 0) - && APR_SUCCESS == apr_env_get(&value, key, pp)) { - res = NewStringUTF(jenv, value); - apr_pool_destroy(pp); - } - ReleaseStringUTFChars(jenv, jname, key); - } - return res; -} - -/* -* Class: java_lang_VMExecutionEngine -* Method: getenv -* Signature: ()Ljava/util/Map; -*/ -JNIEXPORT jobject JNICALL Java_java_lang_VMExecutionEngine_getenv__ -(JNIEnv *jenv, jclass) { - Global_Env * genv = VM_Global_State::loader_env; - Class* mapClass = genv->LoadCoreClass("java/util/HashMap"); - jmethodID put = (jmethodID)class_lookup_method_recursive(mapClass, "put", - "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"); - jobject jmap = create_default_instance(mapClass); - if (jmap) { - apr_pool_t *pp; - if (APR_SUCCESS == apr_pool_create(&pp, 0)) { - for (char **e = port_env_all(pp) ; *e; ++e){ - size_t idx = strcspn(*e, "="); - char* key = apr_pstrndup(pp, *e, idx); - jobject jkey = NewStringUTF(jenv, key); - if (!jkey) break; - jobject jval = NewStringUTF(jenv, *e+idx+1); - if (!jval) break; - CallObjectMethod(jenv, jmap, put, jkey, jval); - assert(!exn_raised()); - } - apr_pool_destroy(pp); - } - } - - return jmap; -} - -/* -* Class: java_lang_VMExecutionEngine * Method: mapLibraryName * Signature: (Ljava/lang/String;)Ljava/lang/String; */ Index: vm/vmcore/src/kernel_classes/javasrc/java/lang/System.java =================================================================== --- vm/vmcore/src/kernel_classes/javasrc/java/lang/System.java (revision 481162) +++ vm/vmcore/src/kernel_classes/javasrc/java/lang/System.java (working copy) @@ -25,7 +25,6 @@ import java.io.PrintStream; import java.io.IOException; import java.security.SecurityPermission; -import java.util.Collections; import java.util.Map; import java.util.Properties; import java.util.PropertyPermission; @@ -34,6 +33,7 @@ import org.apache.harmony.lang.RuntimePermissionCollection; import org.apache.harmony.vm.VMStack; +import org.apache.harmony.luni.platform.Environment; /** * @com.intel.drl.spec_ref @@ -114,7 +114,7 @@ if (sm != null) { sm.checkPermission(new RuntimePermission("getenv." + name)); } - return VMExecutionEngine.getenv(name); + return Environment.getenv(name); } /** @@ -125,7 +125,7 @@ if (sm != null) { sm.checkPermission(RuntimePermissionCollection.GETENV_PERMISSION); } - return Collections.unmodifiableMap(VMExecutionEngine.getenv()); + return Environment.getenv(); } /** Index: vm/vmcore/src/kernel_classes/javasrc/java/lang/VMExecutionEngine.java =================================================================== --- vm/vmcore/src/kernel_classes/javasrc/java/lang/VMExecutionEngine.java (revision 481162) +++ vm/vmcore/src/kernel_classes/javasrc/java/lang/VMExecutionEngine.java (working copy) @@ -191,20 +191,6 @@ static native long nanoTime(); /** - * Returns the value of the environment variable specified by - * name argument or null if it is not set. - * @api2vm - */ - static native String getenv(String name); - - /** - * Returns the whole environment as a name-value mapping. - * May return empty map. - * @api2vm - */ - static native Map getenv(); - - /** * Returns platform-specific name of the specified library. * @api2vm */