harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r486378 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c
Date Tue, 12 Dec 2006 22:35:58 GMT
Author: gshimansky
Date: Tue Dec 12 14:35:57 2006
New Revision: 486378

URL: http://svn.apache.org/viewvc?view=rev&rev=486378
Log:
Fixed changes in r486100. When GetSystemProperty for org.apache.harmony.boot.class.path it
doesn't mean that readClassPathFromPropertiesFile should immidiatelly return with an error.
Instead it should just use the properties read from bootclasspath.properties file.


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=486378&r1=486377&r2=486378
==============================================================================
--- 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 14:35:57 2006
@@ -263,24 +263,20 @@
 
     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'};
 		
-		/* Read current value of bootclasspath property */
+        /* Read current value of bootclasspath property */
         rcGetProperty = (*vmInterface)->GetSystemProperty (vmInterface,
             BOOTCLASSPATH_PROPERTY,
             &bootstrapClassPath);
 
+        /* Gregory - no property is found, VM bootclasspath is not defined */
         if (VMI_ERROR_NONE != rcGetProperty)
-        {
-            returnCode = JNI_ERR;
-            goto cleanup;
-        }
+            bootstrapClassPath = NULL;
 
         qsort(props, number, sizeof(key_value_pair), props_compare);
 



Mime
View raw message