Author: violetagg
Date: Thu Dec 17 10:21:32 2015
New Revision: 1720506
URL: http://svn.apache.org/viewvc?rev=1720506&view=rev
Log:
Fixed findbugs issues:
- Do not invoke toString() method on a String
- Do not invoke inefficient Boolean constructor; use Boolean.valueOf(...)
instead
- Close Stream in try with resources
Update false positives filter
Modified:
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
tomcat/trunk/java/org/apache/coyote/http2/HpackEncoder.java
tomcat/trunk/java/org/apache/el/stream/Stream.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1720506&r1=1720505&r2=1720506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Thu
Dec 17 10:21:32 2015
@@ -1129,7 +1129,7 @@ public class NamingContextListener
(resourceLink.getType(), resourceLink.getGlobal(),
resourceLink.getFactory(), null);
Iterator<String> i = resourceLink.listProperties();
while (i.hasNext()) {
- String key = i.next().toString();
+ String key = i.next();
Object val = resourceLink.getProperty(key);
if (val!=null) {
StringRefAddr refAddr = new StringRefAddr(key, val.toString());
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?rev=1720506&r1=1720505&r2=1720506&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
Thu Dec 17 10:21:32 2015
@@ -315,7 +315,7 @@ public class JmxRemoteLifecycleListener
String url = "service:jmx:rmi://" + bindAddress;
JMXServiceURL serviceUrl;
try {
- serviceUrl = new JMXServiceURL(url.toString());
+ serviceUrl = new JMXServiceURL(url);
} catch (MalformedURLException e) {
log.error(sm.getString("jmxRemoteLifecycleListener.invalidURL",
serverName, url), e);
return null;
Modified: tomcat/trunk/java/org/apache/coyote/http2/HpackEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HpackEncoder.java?rev=1720506&r1=1720505&r2=1720506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/HpackEncoder.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/HpackEncoder.java Thu Dec 17
10:21:32 2015
@@ -211,7 +211,7 @@ public class HpackEncoder {
private void writeHuffmanEncodableName(ByteBuffer target, String
headerName) {
if (hpackHeaderFunction.shouldUseHuffman(headerName)) {
- if(HPackHuffman.encode(target, headerName.toString(), true)) {
+ if(HPackHuffman.encode(target, headerName, true)) {
return;
}
}
Modified: tomcat/trunk/java/org/apache/el/stream/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/stream/Stream.java?rev=1720506&r1=1720505&r2=1720506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/stream/Stream.java (original)
+++ tomcat/trunk/java/org/apache/el/stream/Stream.java Thu Dec 17 10:21:32 2015
@@ -391,7 +391,7 @@ public class Stream {
match = (Boolean) le.invoke(iterator.next());
}
- return new Optional(new Boolean(!match.booleanValue()));
+ return new Optional(Boolean.valueOf(!match.booleanValue()));
}
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1720506&r1=1720505&r2=1720506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Dec 17 10:21:32 2015
@@ -1372,7 +1372,7 @@ public class JspC extends Task implement
Iterator<String> iter = pages.iterator();
while (iter.hasNext()) {
- String nextjsp = iter.next().toString();
+ String nextjsp = iter.next();
File fjsp = new File(nextjsp);
if (!fjsp.isAbsolute()) {
fjsp = new File(uriRootF, nextjsp);
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1720506&r1=1720505&r2=1720506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Thu Dec 17
10:21:32 2015
@@ -224,9 +224,9 @@ public class SmapUtil {
addSDE();
// write result
- FileOutputStream outStream = new FileOutputStream(outClassFile);
- outStream.write(gen, 0, genPos);
- outStream.close();
+ try (FileOutputStream outStream = new
FileOutputStream(outClassFile);) {
+ outStream.write(gen, 0, genPos);
+ }
}
static byte[] readWhole(File input) throws IOException {
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1720506&r1=1720505&r2=1720506&view=diff
==============================================================================
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Thu Dec 17 10:21:32
2015
@@ -350,6 +350,13 @@
<Bug code="ES"/>
</Match>
<Match>
+ <!-- Stream is closed in o.a.juli.ClassLoaderLogManager.readConfiguration
+ (InputStream, ClassLoader) -->
+ <Class name="org.apache.juli.ClassLoaderLogManager"/>
+ <Method name="readConfiguration"/>
+ <Bug code="OBL"/>
+ </Match>
+ <Match>
<!-- Simpler to catch Exception than to create dummy implementations of the
necessary exception hierarchy -->
<Class name="org.apache.naming.factory.SendMailFactory$1" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
