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

JndiPropertySource defensively skips invalid JNDI lookup for property name with colon in resource-ref mode

Browse Source 
Issue: SPR-14518
This commit is contained in:
Juergen Hoeller
2016-07-27 22:37:25 +02:00
parent 3ab21741f9
commit 328e04f167
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
spring-context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2016 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.
@@ -30,6 +30,7 @@ import static org.junit.Assert.*;
* Unit tests for {@link JndiPropertySource}.
*
* @author Chris Beams
* @author Juergen Hoeller
* @since 3.1
*/
public class JndiPropertySourceTests {
@@ -56,7 +57,7 @@ public class JndiPropertySourceTests {
jndiLocator.setJndiTemplate(jndiTemplate);
JndiPropertySource ps = new JndiPropertySource("jndiProperties", jndiLocator);
assertThat((String)ps.getProperty("p1"), equalTo("v1"));
assertThat(ps.getProperty("p1"), equalTo("v1"));
}
@Test
@@ -75,7 +76,36 @@ public class JndiPropertySourceTests {
jndiLocator.setJndiTemplate(jndiTemplate);
JndiPropertySource ps = new JndiPropertySource("jndiProperties", jndiLocator);
assertThat((String)ps.getProperty("p1"), equalTo("v1"));
assertThat(ps.getProperty("p1"), equalTo("v1"));
}
@Test
public void propertyWithDefaultClauseInResourceRefMode() {
JndiLocatorDelegate jndiLocator = new JndiLocatorDelegate() {
@Override
public Object lookup(String jndiName) throws NamingException {
throw new IllegalStateException("Should not get called");
}
};
jndiLocator.setResourceRef(true);
JndiPropertySource ps = new JndiPropertySource("jndiProperties", jndiLocator);
assertThat(ps.getProperty("propertyKey:defaultValue"), nullValue());
}
@Test
public void propertyWithColonInNonResourceRefMode() {
JndiLocatorDelegate jndiLocator = new JndiLocatorDelegate() {
@Override
public Object lookup(String jndiName) throws NamingException {
assertEquals("my:key", jndiName);
return "my:value";
}
};
jndiLocator.setResourceRef(false);
JndiPropertySource ps = new JndiPropertySource("jndiProperties", jndiLocator);
assertThat(ps.getProperty("my:key"), equalTo("my:value"));
}
}