From 35055fd866baadefeec2e2f47d1d94454763b452 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 21 Jun 2012 12:28:12 +0200
Subject: [PATCH] Refactor PropertyResolver impl for consistency

PropertySourcesPropertyResolver#containsProperty now
calls #containsProperty on each underlying PropertySource instead of
calling #getProperty and checking for null.

Issue: SPR-9529
---
 .../core/env/PropertySourcesPropertyResolver.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java b/spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java
index 333056f3cb..b390d4ddab 100644
--- a/spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
 
 	public boolean containsProperty(String key) {
 		for (PropertySource<?> propertySource : this.propertySources) {
-			if (propertySource.getProperty(key) != null) {
+			if (propertySource.containsProperty(key)) {
 				return true;
 			}
 		}