Author: markt
Date: Tue May 26 16:08:26 2009
New Revision: 778784
URL: http://svn.apache.org/viewvc?rev=778784&view=rev
Log:
Remove a few lines of redundant code
Modified:
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=778784&r1=778783&r2=778784&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Tue May
26 16:08:26 2009
@@ -819,12 +819,11 @@
if (fileAbsPath.endsWith("."))
fileAbsPath = fileAbsPath + "/";
String absPath = normalize(fileAbsPath);
- if (canPath != null)
- canPath = normalize(canPath);
+ canPath = normalize(canPath);
if ((absoluteBase.length() < absPath.length())
&& (absoluteBase.length() < canPath.length())) {
absPath = absPath.substring(absoluteBase.length() + 1);
- if ((canPath == null) || (absPath == null))
+ if (absPath == null)
return null;
if (absPath.equals(""))
absPath = "/";
Modified: tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java?rev=778784&r1=778783&r2=778784&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java Tue
May 26 16:08:26 2009
@@ -688,8 +688,6 @@
if (result == null) {
if (collection)
result = COLLECTION_TYPE;
- else
- result = null;
}
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
