You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by od...@apache.org on 2009/07/29 11:57:36 UTC
svn commit: r798830 - in
/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands:
ClassType.cpp ObjectReference.cpp
Author: odeakin
Date: Wed Jul 29 09:57:36 2009
New Revision: 798830
URL: http://svn.apache.org/viewvc?rev=798830&view=rev
Log:
Fix for HARMONY-6246 (Crash during debugging session) - we do not create a global ref for array references, but then try to delete the non-existent global ref resulting in a crash.
Modified:
harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/ClassType.cpp
harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/ObjectReference.cpp
Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/ClassType.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/ClassType.cpp?rev=798830&r1=798829&r2=798830&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/ClassType.cpp (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/ClassType.cpp Wed Jul 29 09:57:36 2009
@@ -398,6 +398,7 @@
case JDWP_TAG_VOID:
jni->CallStaticVoidMethodA(m_clazz, m_methodID, m_methodValues);
break;
+ case JDWP_TAG_ARRAY:
case JDWP_TAG_OBJECT: {
m_returnValue.value.l =
jni->CallStaticObjectMethodA(m_clazz, m_methodID, m_methodValues);
Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/ObjectReference.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/ObjectReference.cpp?rev=798830&r1=798829&r2=798830&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/ObjectReference.cpp (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/agent/commands/ObjectReference.cpp Wed Jul 29 09:57:36 2009
@@ -811,6 +811,7 @@
case JDWP_TAG_VOID:
jni->CallNonvirtualVoidMethodA(m_object, m_clazz, m_methodID, m_methodValues);
break;
+ case JDWP_TAG_ARRAY:
case JDWP_TAG_OBJECT:
m_returnValue.value.l =
jni->CallNonvirtualObjectMethodA(m_object, m_clazz, m_methodID, m_methodValues);
@@ -855,6 +856,7 @@
case JDWP_TAG_VOID:
jni->CallVoidMethodA(m_object, m_methodID, m_methodValues);
break;
+ case JDWP_TAG_ARRAY:
case JDWP_TAG_OBJECT:
m_returnValue.value.l =
jni->CallObjectMethodA(m_object, m_methodID, m_methodValues);