# HG changeset patch
# User xlu
# Date 1256751437 25200
# Node ID d912f17c1ae48e5c78834ffeab2efdd1adcd15ab
# Parent  a3b9e96881fe15b91b94ebd412bccbf81c8ceaab# Parent  d8dd291a362acb656026a9c0a9da48501505a1e7
Merge

diff -r d8dd291a362a -r d912f17c1ae4 src/share/vm/prims/jni.cpp
--- a/src/share/vm/prims/jni.cpp	Fri Oct 23 14:28:47 2009 -0700
+++ b/src/share/vm/prims/jni.cpp	Wed Oct 28 10:37:17 2009 -0700
@@ -2116,7 +2116,7 @@
   DT_RETURN_MARK(GetObjectArrayElement, jobject, (const jobject&)ret);
   objArrayOop a = objArrayOop(JNIHandles::resolve_non_null(array));
   if (a->is_within_bounds(index)) {
-    jobject ret = JNIHandles::make_local(env, a->obj_at(index));
+    ret = JNIHandles::make_local(env, a->obj_at(index));
     return ret;
   } else {
     char buf[jintAsStringSize];
@@ -2150,14 +2150,14 @@
 
 #define DEFINE_NEWSCALARARRAY(Return,Allocator,Result) \
 \
-  DT_RETURN_MARK_DECL_FOR(Result, New##Result##Array, Return);\
+  DT_RETURN_MARK_DECL(New##Result##Array, Return);\
 \
 JNI_ENTRY(Return, \
           jni_New##Result##Array(JNIEnv *env, jsize len)) \
   JNIWrapper("New" XSTR(Result) "Array"); \
   DTRACE_PROBE2(hotspot_jni, New##Result##Array__entry, env, len);\
   Return ret = NULL;\
-  DT_RETURN_MARK_FOR(Result, New##Result##Array, Return, (const Return&)ret);\
+  DT_RETURN_MARK(New##Result##Array, Return, (const Return&)ret);\
 \
   oop obj= oopFactory::Allocator(len, CHECK_0); \
   ret = (Return) JNIHandles::make_local(env, obj); \