From 0da65d79b903ccb044eb712724b2f634c2e7f661 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 20 Sep 2019 13:41:55 -0700 Subject: [PATCH] Fix possible NullPointerException when testing and mocking. Resolves gh-52. --- .../geode/config/annotation/ClusterAwareConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAwareConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAwareConfiguration.java index d7a4f578..5eefce69 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAwareConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAwareConfiguration.java @@ -149,8 +149,8 @@ public class ClusterAwareConfiguration extends AbstractAnnotationConfigSupport { Environment environment = context.getEnvironment(); return isAvailable() - || environment.getProperty(SPRING_BOOT_DATA_GEMFIRE_CLUSTER_CONDITION_MATCH_PROPERTY, - Boolean.class, false); + || Boolean.TRUE.equals(environment.getProperty(SPRING_BOOT_DATA_GEMFIRE_CLUSTER_CONDITION_MATCH_PROPERTY, + Boolean.class, false)); } ConditionContext doMatch(ConditionContext conditionContext) {