Author: markt
Date: Mon Mar 7 14:55:22 2011
New Revision: 1078798
URL: http://svn.apache.org/viewvc?rev=1078798&view=rev
Log:
Code cleanup
- remove unused code
- fix FindBugs warnings
- fix Eclipse warnings
Removed:
tomcat/trunk/java/org/apache/naming/resources/jndi/
Modified:
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
tomcat/trunk/java/org/apache/naming/resources/ResourceCache.java
tomcat/trunk/java/org/apache/naming/resources/WARDirContext.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=1078798&r1=1078797&r2=1078798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Mon Mar
7 14:55:22 2011
@@ -270,7 +270,10 @@ public class FileDirContext extends Base
File newFile = new File(base, newName);
- file.renameTo(newFile);
+ if (!file.renameTo(newFile)) {
+ throw new NamingException(sm.getString("resources.renameFail",
+ oldName, newName));
+ }
}
Modified: tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties?rev=1078798&r1=1078797&r2=1078798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties Mon
Mar 7 14:55:22 2011
@@ -22,10 +22,12 @@ resources.addResourcesJarFail=Failed to
resources.alreadyStarted=Resources has already been started
resources.connect=Cannot connect to document base {0}
resources.input=Cannot create input stream for resource {0}
+resources.invalidCache=Unable to create a resource cache of type [{0}]
resources.notStarted=Resources has not yet been started
resources.null=Document base cannot be null
resources.notFound=Resource {0} not found
resources.path=Context relative path {0} must start with ''/''
+resources.renameFail=Failed to rename [{0}] to [{1}]
resources.alreadyBound=Name {0} is already bound in this Context
resources.bindFailed=Bind failed: {0}
resources.unbindFailed=Unbind failed: {0}
Modified: tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java?rev=1078798&r1=1078797&r2=1078798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java Mon Mar
7 14:55:22 2011
@@ -82,8 +82,8 @@ public class ProxyDirContext implements
cache = (ResourceCache)
Class.forName(cacheClassName).newInstance();
} catch (Exception e) {
- //FIXME
- e.printStackTrace();
+ throw new IllegalArgumentException(sm.getString(
+ "resources.invalidCache", cacheClassName), e);
}
cache.setCacheMaxSize(baseDirContext.getCacheMaxSize());
cacheTTL = baseDirContext.getCacheTTL();
Modified: tomcat/trunk/java/org/apache/naming/resources/ResourceCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ResourceCache.java?rev=1078798&r1=1078797&r2=1078798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/ResourceCache.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/ResourceCache.java Mon Mar 7
14:55:22 2011
@@ -362,7 +362,7 @@ public class ResourceCache {
int i = 0;
while (true) {
- i = (b + a) / 2;
+ i = (b + a) >>> 1;
int result = name.compareTo(map[i].name);
if (result > 0) {
a = i;
Modified: tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java?rev=1078798&r1=1078797&r2=1078798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java Mon Mar 7
14:55:22 2011
@@ -896,7 +896,19 @@ public class WARDirContext extends BaseD
public int compareTo(Object o) {
if (!(o instanceof Entry))
return (+1);
- return (name.compareTo(((Entry) o).getName()));
+ return name.compareTo(((Entry) o).getName());
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (!(o instanceof Entry))
+ return false;
+ return name.equals(((Entry) o).getName());
+ }
+
+ @Override
+ public int hashCode() {
+ return name.hashCode();
}
public ZipEntry getEntry() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
