Author: markt
Date: Fri Oct 13 15:04:47 2017
New Revision: 1812139
URL: http://svn.apache.org/viewvc?rev=1812139&view=rev
Log:
Fix some SpotBugs false positives
Modified:
tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
tomcat/trunk/test/org/apache/jasper/TestJspC.java
tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
Modified:
tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java?rev=1812139&r1=1812138&r2=1812139&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
Fri Oct 13 15:04:47 2017
@@ -129,9 +129,11 @@ public class TestLoadBalancerDrainingVal
@Override
public boolean equals(Object o) {
- if(null == o) return false;
- MyCookie mc = (MyCookie)o;
+ if(!(o instanceof MyCookie)) {
+ return false;
+ }
+ MyCookie mc = (MyCookie)o;
return mc.getName().equals(this.getName())
&& mc.getPath().equals(this.getPath())
&& mc.getValue().equals(this.getValue())
Modified: tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java?rev=1812139&r1=1812138&r2=1812139&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java Fri Oct
13 15:04:47 2017
@@ -148,6 +148,7 @@ public class TestUpgrade extends TomcatB
Assert.assertEquals(MESSAGE, response);
uc.shutdownInput();
+ pw.close();
}
Modified:
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1812139&r1=1812138&r2=1812139&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
(original)
+++
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
Fri Oct 13 15:04:47 2017
@@ -80,6 +80,7 @@ public class TestUpgradeInternalHandler
Assert.assertEquals(MESSAGE, response);
uc.shutdownInput();
+ pw.close();
}
private UpgradeConnection doUpgrade(
Modified: tomcat/trunk/test/org/apache/jasper/TestJspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/TestJspC.java?rev=1812139&r1=1812138&r2=1812139&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/TestJspC.java (original)
+++ tomcat/trunk/test/org/apache/jasper/TestJspC.java Fri Oct 13 15:04:47 2017
@@ -114,7 +114,7 @@ public class TestJspC {
private void precompile(File appDir, File webappOut) throws IOException {
remove(webappOut);
- webappOut.mkdirs();
+ Assert.assertTrue("Failed to create [" + webappOut + "]",
webappOut.mkdirs());
jspc.setUriroot(appDir.toString());
jspc.setOutputDir(webappOut.toString());
jspc.setValidateTld(false);
Modified: tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java?rev=1812139&r1=1812138&r2=1812139&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java Fri Oct
13 15:04:47 2017
@@ -58,7 +58,8 @@ public class TestJspCompilationContext e
Assert.assertTrue(body.toString().contains("00 - OK"));
File jsp = new File("test/webapp/jsp/tagFileInJar.jsp");
- jsp.setLastModified(jsp.lastModified() + 10000);
+ Assert.assertTrue("Failed to set last modified for [" + jsp + "]",
+ jsp.setLastModified(jsp.lastModified() + 10000));
// This test requires that modificationTestInterval is set to zero in
// web.xml. If not, a sleep longer that modificationTestInterval is
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1812139&r1=1812138&r2=1812139&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Fri Oct 13
15:04:47 2017
@@ -226,7 +226,7 @@ public final class TesterSupport {
X509Certificate cert =
(X509Certificate)ks.getCertificate(CA_ALIAS);
clientAuthExpectedIssuer = cert.getSubjectDN().getName();
} catch (Exception ex) {
- // Ignore
+ throw new RuntimeException(ex);
}
String cn = "NOTFOUND";
@@ -235,7 +235,7 @@ public final class TesterSupport {
X509Certificate cert =
(X509Certificate)ks.getCertificate(CLIENT_ALIAS);
cn = cert.getSubjectDN().getName();
} catch (Exception ex) {
- // Ignore
+ throw new RuntimeException(ex);
}
realm.addUser(cn, "not used");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
