svn commit: r486100 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c

[od...@apache.org]

Author: odeakin
Date: Tue Dec 12 03:31:55 2006
New Revision: 486100

URL: http://svn.apache.org/viewvc?view=rev&rev=486100
Log:
Previously we just replaced whatever was already in the org.apache.harmony.boot.class.path property with our own bootclasspath. We should not assume that this property is empty before we use it - it depends on the VM's bcp initialisation order and how it utilises this property internally.

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c?view=diff&rev=486100&r1=486099&r2=486100
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c Tue Dec 12 03:31:55 2006
@@ -263,12 +263,24 @@
 
     returnCode = properties_load(PORTLIB, propsFile, &props, &number);
 
+	bootstrapClassPath = "";
+
     if (JNI_OK == returnCode && number != 0)
     {
         unsigned i = 0;
         /* Make a string version of the CP separator */
         char cpSeparator[] = {(char)hysysinfo_get_classpathSeparator (), '\0'};
-        bootstrapClassPath = "";
+		
+		/* Read current value of bootclasspath property */
+		rcGetProperty = (*vmInterface)->GetSystemProperty (vmInterface,
+            BOOTCLASSPATH_PROPERTY,
+            &bootstrapClassPath);
+
+		if (VMI_ERROR_NONE != rcGetProperty)
+        {
+            returnCode = JNI_ERR;
+			goto cleanup;
+        }
 
         qsort(props, number, sizeof(key_value_pair), props_compare);