From daff90f2305b3f7f59552f2c240273f609410b57 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 11 Dec 2018 11:00:31 +0000 Subject: [PATCH] Ensure null order is not allowed to bubble up to annotation utils Fixes gh-456 --- .../cloud/bootstrap/BootstrapImportSelector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapImportSelector.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapImportSelector.java index c6f9daf4..9f36210f 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapImportSelector.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapImportSelector.java @@ -119,7 +119,7 @@ public class BootstrapImportSelector implements EnvironmentAware, DeferredImport @Override public Annotation[] getAnnotations() { - return new Annotation[]{order}; + return order == null ? new Annotation[0] : new Annotation[]{order}; } @Override