Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimize SystemEnvPropertySource when possible

Browse Source 
Update SystemEnvironmentPropertySource to attempt optimized Map lookups
first, and only fall-back to the defensive SecurityManager safe-mode
if these fail.

Issue: SPR-12224
This commit is contained in:
Phillip Webb
2014-09-20 00:17:10 -07:00
parent 607d9454df
commit 752574de1d
2 changed files with 58 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java vendored
View File

@@ -16,15 +16,15 @@
package org.springframework.core.env;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import java.util.HashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Unit tests for {@link SystemEnvironmentPropertySource}.
*
@@ -101,4 +101,18 @@ public class SystemEnvironmentPropertySourceTests {
assertThat(ps.getProperty("a.key"), equalTo((Object)"a_value"));
}
@Test
public void withSecurityConstraints() throws Exception {
envMap = new HashMap<String, Object>() {
@Override
public boolean containsKey(Object key) {
throw new UnsupportedOperationException();
}
};
ps = new SystemEnvironmentPropertySource("sysEnv", envMap);
envMap.put("A_KEY", "a_value");
assertThat(ps.containsProperty("A_KEY"), equalTo(true));
assertThat(ps.getProperty("A_KEY"), equalTo((Object)"a_value"));
}
}