Author: markt
Date: Wed Jun 29 18:54:10 2016
New Revision: 1750690
URL: http://svn.apache.org/viewvc?rev=1750690&view=rev
Log:
Fix a couple of FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1750690&r1=1750689&r2=1750690&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Wed
Jun 29 18:54:10 2016
@@ -2125,11 +2125,10 @@ public abstract class WebappClassLoaderB
checkStateForResourceLoading(name);
- String path = binaryNameToPath(name, true);
-
- if (name == null || path == null) {
+ if (name == null) {
return null;
}
+ String path = binaryNameToPath(name, true);
ResourceEntry entry = resourceEntries.get(path);
WebResource resource = null;
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1750690&r1=1750689&r2=1750690&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Wed Jun
29 18:54:10 2016
@@ -29,6 +29,7 @@ import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.RandomAccessFile;
import java.io.Reader;
+import java.io.Serializable;
import java.io.StringReader;
import java.io.StringWriter;
import java.security.AccessController;
@@ -2378,7 +2379,8 @@ public class DefaultServlet extends Http
}
}
- protected static class CompressionFormat {
+ protected static class CompressionFormat implements Serializable {
+ private static final long serialVersionUID = 1L;
public final String extension;
public final String encoding;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
