[GR-17052] Backport: Headers not put in the same location.

PullRequest: graal/4014
oracle · Jul 12, 2019 · 41a03b4 · 41a03b4
2 parents 54dbcd8 + 3ecb908
commit 41a03b4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ImageClassLoader.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ImageClassLoader.java
@@ -299,6 +299,9 @@ private void handleClass(Class<?> clazz) {
         boolean isHostedOnly = false;
 
         AnnotatedElement cur = clazz.getPackage();
+        if (cur == null) {
+            cur = clazz;
+        }
         do {
             Platforms platformsAnnotation = cur.getAnnotation(Platforms.class);
             if (containsHostedOnly(platformsAnnotation)) {