You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2009/01/15 15:55:47 UTC
svn commit: r734728 - in /tomcat/trunk/java/org/apache: catalina/ha/session/
catalina/startup/ catalina/tribes/group/interceptors/ coyote/ajp/
coyote/http11/ jasper/runtime/ jasper/xmlparser/ jk/common/ jk/config/
naming/factory/ tomcat/util/ tomcat/ut...
Author: markt
Date: Thu Jan 15 06:55:46 2009
New Revision: 734728
URL: http://svn.apache.org/viewvc?rev=734728&view=rev
Log:
Remove unused variables identified by Eclipse
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
tomcat/trunk/java/org/apache/jk/common/ChannelJni.java
tomcat/trunk/java/org/apache/jk/common/ChannelUn.java
tomcat/trunk/java/org/apache/jk/config/NSConfig.java
tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
tomcat/trunk/java/org/apache/tomcat/util/digester/NodeCreateRule.java
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java Thu Jan 15 06:55:46 2009
@@ -604,7 +604,7 @@
for ( int i=0; i<size; i++) {
String id = oin.readUTF();
byte[] data = (byte[])oin.readObject();
- Session session = readSession(data,id);
+ readSession(data,id);
}//for
stateTransferred=true;
break;
Modified: tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java Thu Jan 15 06:55:46 2009
@@ -84,7 +84,7 @@
* the element name otherwise
*/
public void end(String namespace, String name) throws Exception {
- Object top = digester.pop();
+ digester.pop();
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Thu Jan 15 06:55:46 2009
@@ -808,8 +808,8 @@
if (multiParams == null) {
paramValues[multiParamIndex] = null;
- Object result = IntrospectionUtils.callMethodN(target, methodName,
- paramValues, paramTypes);
+ IntrospectionUtils.callMethodN(target, methodName, paramValues,
+ paramTypes);
return;
}
@@ -822,8 +822,8 @@
} else {
paramValues[multiParamIndex] = param;
}
- Object result = IntrospectionUtils.callMethodN(target, methodName,
- paramValues, paramTypes);
+ IntrospectionUtils.callMethodN(target, methodName, paramValues,
+ paramTypes);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java Thu Jan 15 06:55:46 2009
@@ -92,7 +92,7 @@
byte[] data = new byte[1024];
Arrays.fill(data,(byte)1);
byte[] compress = compress(data);
- byte[] decompress = decompress(compress);
+ decompress(compress);
System.out.println("Debug test");
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Thu Jan 15 06:55:46 2009
@@ -96,7 +96,7 @@
outputBuffer = ByteBuffer.allocateDirect(packetSize * 2);
// Cause loading of HexUtils
- int foo = HexUtils.DEC[0];
+ HexUtils.load();
// Cause loading of HttpMessages
HttpMessages.getMessage(200);
@@ -1142,7 +1142,6 @@
boolean useAvailableData)
throws IOException {
- byte[] buf = message.getBuffer();
int headerLength = message.getHeaderLength();
if (first) {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Jan 15 06:55:46 2009
@@ -91,7 +91,7 @@
bodyMessage = new AjpMessage(packetSize);
// Cause loading of HexUtils
- int foo = HexUtils.DEC[0];
+ HexUtils.load();
// Cause loading of HttpMessages
HttpMessages.getMessage(200);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Jan 15 06:55:46 2009
@@ -101,7 +101,7 @@
initializeFilters();
// Cause loading of HexUtils
- int foo = HexUtils.DEC[0];
+ HexUtils.load();
// Cause loading of FastHttpDateFormat
FastHttpDateFormat.getCurrentDate();
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Jan 15 06:55:46 2009
@@ -103,7 +103,7 @@
initializeFilters();
// Cause loading of HexUtils
- int foo = HexUtils.DEC[0];
+ HexUtils.load();
// Cause loading of FastHttpDateFormat
FastHttpDateFormat.getCurrentDate();
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu Jan 15 06:55:46 2009
@@ -96,7 +96,7 @@
initializeFilters();
// Cause loading of HexUtils
- int foo = HexUtils.DEC[0];
+ HexUtils.load();
}
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java Thu Jan 15 06:55:46 2009
@@ -346,7 +346,6 @@
if(t.equals(String.class)) {
method.invoke(bean, new Object[] { values });
} else {
- Object tmpval = null;
createTypedArray (prop, bean, method, values, t,
propertyEditorClass);
}
@@ -573,7 +572,6 @@
//allocate the buffer - use byte[] to avoid calls to new.
byte holdbuffer[] = new byte[encoded.length()];
- char holdchar;
int bufcount = 0;
for (int count = 0; count < encoded.length(); count++) {
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java Thu Jan 15 06:55:46 2009
@@ -176,7 +176,7 @@
treeNode.setBody(body);
}
} else {
- TreeNode treeChild = convert(treeNode, child);
+ convert(treeNode, child);
}
}
}
Modified: tomcat/trunk/java/org/apache/jk/common/ChannelJni.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/common/ChannelJni.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/common/ChannelJni.java (original)
+++ tomcat/trunk/java/org/apache/jk/common/ChannelJni.java Thu Jan 15 06:55:46 2009
@@ -147,7 +147,6 @@
if( apr==null ) return -1;
long xEnv=ep.getJniEnv();
- long cEndpointP=ep.getJniContext();
int type=ep.getType();
if( log.isDebugEnabled() ) log.debug("ChannelJni.invoke: " + ep + " " + type);
Modified: tomcat/trunk/java/org/apache/jk/common/ChannelUn.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/common/ChannelUn.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/common/ChannelUn.java (original)
+++ tomcat/trunk/java/org/apache/jk/common/ChannelUn.java Thu Jan 15 06:55:46 2009
@@ -305,7 +305,7 @@
}
ep.setType(0);
log.debug( "Process msg ");
- int status=next.invoke( recv, ep );
+ next.invoke( recv, ep );
}
if( log.isDebugEnabled() )
log.debug( "Closing un channel");
Modified: tomcat/trunk/java/org/apache/jk/config/NSConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/config/NSConfig.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/config/NSConfig.java (original)
+++ tomcat/trunk/java/org/apache/jk/config/NSConfig.java Thu Jan 15 06:55:46 2009
@@ -246,7 +246,6 @@
protected void generateStupidMappings(Context context, PrintWriter objfile )
{
String ctxPath = context.getPath();
- String nPath=("".equals(ctxPath)) ? "/" : ctxPath;
if( noRoot && "".equals(ctxPath) ) {
log.debug("Ignoring root context in forward-all mode ");
Modified: tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java Thu Jan 15 06:55:46 2009
@@ -86,8 +86,6 @@
// Can we process this request?
Reference ref = (Reference) obj;
- String type = ref.getClassName();
-
// Read the global ref addr
String globalName = null;
RefAddr refAddr = ref.get(ResourceLinkRef.GLOBALNAME);
Modified: tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Thu Jan 15 06:55:46 2009
@@ -451,7 +451,6 @@
String setter = "set" + capitalize(name);
try {
Method methods[] = findMethods(o.getClass());
- Method setPropertyMethod = null;
// find setFoo() method
for (int i = 0; i < methods.length; i++) {
Class<?> paramT[] = methods[i].getParameterTypes();
@@ -644,7 +643,6 @@
public static void addJarsFromClassPath(Vector<URL> jars, String cp)
throws IOException, MalformedURLException {
String sep = System.getProperty("path.separator");
- String token;
StringTokenizer st;
if (cp != null) {
st = new StringTokenizer(cp, sep);
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java Thu Jan 15 06:55:46 2009
@@ -175,6 +175,13 @@
/**
+ * Provide a mechanism for ensuring this class is loaded.
+ */
+ public static void load() {
+ // Nothing to do
+ }
+
+ /**
* [Private] Convert the specified value (0 .. 15) to the corresponding
* hexadecimal digit.
*
@@ -191,4 +198,4 @@
}
-}
+}
\ No newline at end of file
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/NodeCreateRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/NodeCreateRule.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/NodeCreateRule.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/NodeCreateRule.java Thu Jan 15 06:55:46 2009
@@ -427,7 +427,7 @@
*/
public void end(String namespace, String name) throws Exception {
- Object top = digester.pop();
+ digester.pop();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java Thu Jan 15 06:55:46 2009
@@ -867,7 +867,6 @@
MappingData mappingData) {
int pathEnd = path.getEnd();
- int pathOffset = path.getOffset();
int lastSlash = -1;
int length = -1;
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Thu Jan 15 06:55:46 2009
@@ -491,7 +491,6 @@
*/
public MBeanOperationInfo getMethodInfo( ObjectName oname, String opName )
{
- String type=null;
MBeanInfo info=null;
try {
info=server.getMBeanInfo(oname);
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java?rev=734728&r1=734727&r2=734728&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java Thu Jan 15 06:55:46 2009
@@ -355,7 +355,7 @@
for (Node argN = firstArgN; argN != null;
argN = DomUtil.getNext( argN ))
{
- String type=DomUtil.getAttribute(argN, "type");
+ DomUtil.getAttribute(argN, "type");
String value=DomUtil.getAttribute(argN, "value");
if( value==null ) {
// The value may be specified as CDATA
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org