You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ay...@apache.org on 2007/05/17 19:56:24 UTC

svn commit: r539044 - in /harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes: javasrc/org/apache/harmony/vm/VMStack.java native/org_apache_harmony_vm_VMStack.cpp

Author: ayza
Date: Thu May 17 10:56:23 2007
New Revision: 539044

URL: http://svn.apache.org/viewvc?view=rev&rev=539044
Log:
Applying patch for HARMONY-2451 ([classlib][luni] SecurityManager.getClassContext output differs from the RI)

Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/vm/VMStack.java
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/vm/VMStack.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/vm/VMStack.java?view=diff&rev=539044&r1=539043&r2=539044
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/vm/VMStack.java (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/vm/VMStack.java Thu May 17 10:56:23 2007
@@ -58,9 +58,10 @@
      * Collects and returns the stack of the current thread as an array of
      * classes. Resulting array should contain maxSize elements at the maximum.
      * Note that reflection stack frames should not be taken into account. The
-     * caller of the caller of this method is stored as a first element of the
-     * array. If considerPrivileged is true then the last element of the array
-     * should be the caller of the most recent privileged method.  
+     * caller of the caller of the caller of this method is stored as a first
+     * element of the array. If considerPrivileged is true then the last
+     * element of the array should be the caller of the most recent privileged
+     * method.  
      * <p>
      * This method may be used by security checks implementation. It is not
      * supposed to be used by Throwable class.

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp?view=diff&rev=539044&r1=539043&r2=539044
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp Thu May 17 10:56:23 2007
@@ -117,9 +117,9 @@
     StackTraceFrame* frames;
     st_get_trace(get_thread_ptr(), &size, &frames);
 
-    // The caller of the caller of this method is stored as a first element of the array.
-    // For details look at the org/apache/harmony/vm/VMStack.java file. Thus skipping 2 frames.
-    unsigned skip = 2;
+    // The caller of the caller of the caller of this method is stored as a first element of the array.
+    // For details look at the org/apache/harmony/vm/VMStack.java file. Thus skipping 3 frames.
+    unsigned skip = 3;
 
     Global_Env* genv = jni_get_vm_env(jenv);