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

Return null from JndiPropertySource on lookup failure

Browse Source 
Issue: SPR-8490
This commit is contained in:
Chris Beams
2011-07-02 21:26:30 +00:00
parent e94d1e314f
commit ea6d363c1e
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
org.springframework.context/src/main/java/org/springframework/jndi/JndiPropertySource.java
View File

@@ -25,8 +25,11 @@ import javax.naming.NamingException;
import org.springframework.core.env.PropertySource;
/**
* {@link PropertySource} implementation that reads properties from
* a JNDI {@link Context}.
* {@link PropertySource} implementation that reads properties from a JNDI
* {@link Context}. All properties retrieved through {@link #getProperty(String)} will
* automatically be prefixed with "java:comp/env/" when executing the actual
* {@link Context#lookup(String)} call. This default can be overridden using
* {@link #setJndiPrefix(String)} property.
*
* @author Chris Beams
* @author Juergen Hoeller
@@ -86,14 +89,21 @@ public class JndiPropertySource extends PropertySource<Context> {
}
/**
* Look up and return the given name from the source JNDI {@link Context}.
* {@inheritDoc}
* <p>This implementation looks up and returns the given name from the source JNDI
* {@link Context}. If a {@link NamingException} is thrown during the call to
* {@link Context#lookup(String)}, returns {@code null} and issue a DEBUG-level log
* statement with the exception message.
*/
@Override
public Object getProperty(String name) throws JndiLookupFailureException {
public Object getProperty(String name) {
try {
return this.source.lookup(name);
Object value = this.source.lookup(name);
logger.debug("Context#lookup(" + name + ") returned: [" + value + "]");
return value;
} catch (NamingException ex) {
throw new JndiLookupFailureException("unable to look up name" + name, ex);
logger.debug("Context#lookup(" + name + ") threw NamingException with message: " + ex.getMessage());
return null;
}
}