"resolved conflicts for merge of 3a73bd to master"

diff --cc vm/Jni.c
index 39b773a,09e36a5..10b017c
--- 1/vm/Jni.c
--- 2/vm/Jni.c
+++ b/vm/Jni.c
@@@ -2777,14 -2744,14 +2777,14 @@@ static void* GetDirectBufferAddress(JNI
  
      if(JNI_FALSE == (*env)->IsInstanceOf(env, buf, tempClass))
      {
 -        return 0;
 +        goto bail;
      }
  
-     tempMethod = (*env)->GetMethodID(env, tempClass, "getBaseAddress",
-              "()Lorg/apache/harmony/luni/platform/PlatformAddress;");
+     tempMethod = (*env)->GetMethodID(env, tempClass, "getEffectiveAddress",
+              "()Lorg/apache/harmony/luni/platform/PlatformAddress;");        
      if(!tempMethod){
 -        return 0;
 -    }    
 +        goto bail;
 +    }
      platformAddr = (*env)->CallObjectMethod(env, buf, tempMethod);
      platformAddrClass = (*env)->FindClass (env, 
              "org/apache/harmony/luni/platform/PlatformAddress");