# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1462786314 -7200
# Node ID b11f345e4af4f7acea5e7e19fb6370408bfe587b
# Parent  3039c53c72d3597bc3f70b954a9dd49c25179e89
Return empty array instead of null in getDeclaredAnnotations.

diff -r 3039c53c72d3 -r b11f345e4af4 jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java	Fri May 06 11:01:40 2016 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java	Mon May 09 11:31:54 2016 +0200
@@ -479,7 +479,7 @@
     @Override
     public Annotation[] getDeclaredAnnotations() {
         Executable javaMethod = toJava();
-        return javaMethod == null ? null : javaMethod.getDeclaredAnnotations();
+        return javaMethod == null ? new Annotation[0] : javaMethod.getDeclaredAnnotations();
     }
 
     @Override