Merge pull request apolloconfig#735 from nobodyiam/fix-conditional-npe

fix potential conditional npe
keven0706 · Sep 5, 2017 · d62ba3d · d62ba3d
2 parents c8ef52c + e1d2616
commit d62ba3d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...-common/src/main/java/com/ctrip/framework/apollo/common/condition/OnProfileCondition.java b/...-common/src/main/java/com/ctrip/framework/apollo/common/condition/OnProfileCondition.java
@@ -32,10 +32,15 @@ private Set<String> retrieveAnnotatedProfiles(AnnotatedTypeMetadata metadata, St
       return Collections.emptySet();
     }
 
-    Set<String> profiles = Sets.newHashSet();
     MultiValueMap<String, Object> attributes = metadata.getAllAnnotationAttributes(annotationType);
 
+    if (attributes == null) {
+      return Collections.emptySet();
+    }
+
+    Set<String> profiles = Sets.newHashSet();
     List<?> values = attributes.get("value");
+
     if (values != null) {
       for (Object value : values) {
         if (value instanceof String[]) {