root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

polishing 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2780 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller 2010-01-06 22:24:30 +00:00
parent b330c12cab
commit 97928d1186
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2008 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -79,7 +79,7 @@ public abstract class JndiLocatorSupport extends JndiAccessor {
/** /**
* Perform an actual JNDI lookup for the given name via the JndiTemplate. * Perform an actual JNDI lookup for the given name via the JndiTemplate.
* <p>If the name doesn't begin with "java:comp/env/", this prefix is added * <p>If the name doesn't begin with "java:comp/env/", this prefix is added
* if "resourceRef" is set to "true". * if "resourceRef" is set to "true".
* @param jndiName the JNDI name to look up * @param jndiName the JNDI name to look up
* @param requiredType the required type of the object * @param requiredType the required type of the object
@ -90,7 +90,7 @@ public abstract class JndiLocatorSupport extends JndiAccessor {
protected <T> T lookup(String jndiName, Class<T> requiredType) throws NamingException { protected <T> T lookup(String jndiName, Class<T> requiredType) throws NamingException {
Assert.notNull(jndiName, "'jndiName' must not be null"); Assert.notNull(jndiName, "'jndiName' must not be null");
String convertedName = convertJndiName(jndiName); String convertedName = convertJndiName(jndiName);
T jndiObject = null; T jndiObject;
try { try {
jndiObject = getJndiTemplate().lookup(convertedName, requiredType); jndiObject = getJndiTemplate().lookup(convertedName, requiredType);
} }