diff --git a/org.springframework.context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java b/org.springframework.context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java index 3b1af83a9e..f24e8467f5 100644 --- a/org.springframework.context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java +++ b/org.springframework.context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java @@ -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"); * 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. - *

If the name doesn't begin with "java:comp/env/", this prefix is added + *

If the name doesn't begin with "java:comp/env/", this prefix is added * if "resourceRef" is set to "true". * @param jndiName the JNDI name to look up * @param requiredType the required type of the object @@ -90,7 +90,7 @@ public abstract class JndiLocatorSupport extends JndiAccessor { protected T lookup(String jndiName, Class requiredType) throws NamingException { Assert.notNull(jndiName, "'jndiName' must not be null"); String convertedName = convertJndiName(jndiName); - T jndiObject = null; + T jndiObject; try { jndiObject = getJndiTemplate().lookup(convertedName, requiredType); }