From 1e81ad130dc00a769c7abf5e3098cce5beaca0b8 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 17 Sep 2010 15:02:45 +0000 Subject: [PATCH] Misc Eclipse and FindBugs warnings git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@998168 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/Http11AprProcessor.java | 3 ++- java/org/apache/coyote/http11/InternalNioInputBuffer.java | 1 - java/org/apache/coyote/http11/InternalNioOutputBuffer.java | 10 ---------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java index b45b7854b..df05c7408 100644 --- a/java/org/apache/coyote/http11/Http11AprProcessor.java +++ b/java/org/apache/coyote/http11/Http11AprProcessor.java @@ -534,7 +534,8 @@ public class Http11AprProcessor extends AbstractHttp11Processor implements Actio request.setAttribute(AbstractEndpoint.CERTIFICATE_KEY, certs); } // User key size - sslO = new Integer(SSLSocket.getInfoI(socket, SSL.SSL_INFO_CIPHER_USEKEYSIZE)); + sslO = Integer.valueOf(SSLSocket.getInfoI(socket, + SSL.SSL_INFO_CIPHER_USEKEYSIZE)); request.setAttribute(AbstractEndpoint.KEY_SIZE_KEY, sslO); // SSL session ID diff --git a/java/org/apache/coyote/http11/InternalNioInputBuffer.java b/java/org/apache/coyote/http11/InternalNioInputBuffer.java index 125e1ac1f..7685c4813 100644 --- a/java/org/apache/coyote/http11/InternalNioInputBuffer.java +++ b/java/org/apache/coyote/http11/InternalNioInputBuffer.java @@ -378,7 +378,6 @@ public class InternalNioInputBuffer extends AbstractInputBuffer { byte[] tmp = new byte[newsize]; System.arraycopy(buf,0,tmp,0,buf.length); buf = tmp; - tmp = null; } } diff --git a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java index 1db303f97..7337db429 100644 --- a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java +++ b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java @@ -44,9 +44,6 @@ public class InternalNioOutputBuffer extends AbstractOutputBuffer { // ----------------------------------------------------------- Constructors - int bbufLimit = 0; - - /** * Default constructor. */ @@ -65,13 +62,6 @@ public class InternalNioOutputBuffer extends AbstractOutputBuffer { buf = new byte[headerBufferSize]; - if (headerBufferSize < (8 * 1024)) { - bbufLimit = 6 * 1500; - } else { - bbufLimit = (headerBufferSize / 1500 + 1) * 1500; - } - //bbuf = ByteBuffer.allocateDirect(bbufLimit); - outputStreamOutputBuffer = new SocketOutputBuffer(); filterLibrary = new OutputFilter[0]; -- 2.11.0