harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r557642 - in /harmony/enhanced/jdktools/trunk/modules/jpda: make/exclude.common src/main/native/jdwp/common/agent/commands/VirtualMachine.cpp
Date Thu, 19 Jul 2007 14:34:52 GMT
Author: ayza
Date: Thu Jul 19 07:34:51 2007
New Revision: 557642

URL: http://svn.apache.org/viewvc?view=rev&rev=557642
Log:
Applying patch from HARMONY-2894 ([jdktools][jdwp] JDWP agent uses non-standard VM property)

Modified:
    harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.common
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/VirtualMachine.cpp

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.common?view=diff&rev=557642&r1=557641&r2=557642
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.common (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.common Thu Jul 19 07:34:51 2007
@@ -3,8 +3,6 @@
 #3309
 org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java
 org/apache/harmony/jpda/tests/jdwp/MultiSession/EnableCollectionTest.java
-#3298
-org/apache/harmony/jpda/tests/jdwp/VirtualMachine/ClassPathsTest.java
 #3317
 org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues003Test.java
 #3341

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/VirtualMachine.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/VirtualMachine.cpp?view=diff&rev=557642&r1=557641&r2=557642
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/VirtualMachine.cpp
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/VirtualMachine.cpp
Thu Jul 19 07:34:51 2007
@@ -492,7 +492,14 @@
     char *classPaths = clsMgr.GetProperty(jni, "java.class.path");
     AgentAutoFree dobj_classPaths(classPaths JDWP_FILE_LINE);
 
-    char *bootClassPaths = clsMgr.GetProperty(jni, "vm.boot.class.path");
+    // try several alternatives for boot.class.path
+    char *bootClassPaths = clsMgr.GetProperty(jni, "sun.boot.class.path");
+    if (bootClassPaths == 0) {
+        bootClassPaths = clsMgr.GetProperty(jni, "vm.boot.class.path");
+    }
+    if (bootClassPaths == 0) {
+        bootClassPaths = clsMgr.GetProperty(jni, "org.apache.harmony.boot.class.path");
+    }
     AgentAutoFree dobj_bootClassPaths(bootClassPaths JDWP_FILE_LINE);
 
     char *pathSeparatorString = clsMgr.GetProperty(jni, "path.separator");



Mime
View raw message