Author: ebourg
Date: Wed May 10 14:42:57 2017
New Revision: 1794729
URL: http://svn.apache.org/viewvc?rev=1794729&view=rev
Log:
Removed unnecessary return statements at the end of void methods
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/java/org/apache/juli/FileHandler.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Wed May 10 14:42:57
2017
@@ -593,7 +593,6 @@ public abstract class HttpServlet extend
ServletOutputStream out = resp.getOutputStream();
out.print(buffer.toString());
out.close();
- return;
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed May 10
14:42:57 2017
@@ -1456,8 +1456,6 @@ public class Request implements HttpServ
// Notify interested application event listeners
notifyAttributeRemoved(name, value);
- } else {
- return;
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
Wed May 10 14:42:57 2017
@@ -91,7 +91,6 @@ public class ClusterSessionListener exte
}
}
- return;
}
/**
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Wed May
10 14:42:57 2017
@@ -785,7 +785,6 @@ public class SimpleTcpCluster extends Li
}
}
}
- return;
}
public int getChannelStartOptions() {
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=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Wed
May 10 14:42:57 2017
@@ -643,9 +643,7 @@ public abstract class WebappClassLoaderB
if (this.transformers.remove(transformer)) {
log.info(sm.getString("webappClassLoader.removeTransformer",
transformer, getContextName()));
- return;
}
-
}
protected void copyStateWithoutTransformers(WebappClassLoaderBase base) {
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Wed May
10 14:42:57 2017
@@ -607,7 +607,6 @@ public class ManagerServlet extends Http
log("managerServlet.storeConfig", e);
writer.println(smClient.getString("managerServlet.exception",
e.toString()));
- return;
}
} else {
String contextPath = path;
@@ -630,7 +629,6 @@ public class ManagerServlet extends Http
log("managerServlet.save[" + path + "]", e);
writer.println(smClient.getString("managerServlet.exception",
e.toString()));
- return;
}
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
Wed May 10 14:42:57 2017
@@ -580,9 +580,7 @@ public class HostManagerServlet
"hostManagerServlet.startFailed", name));
writer.println(smClient.getString(
"hostManagerServlet.exception", e.toString()));
- return;
}
-
}
@@ -642,9 +640,7 @@ public class HostManagerServlet
name));
writer.println(smClient.getString("hostManagerServlet.exception",
e.toString()));
- return;
}
-
}
@@ -675,7 +671,6 @@ public class HostManagerServlet
} else {
writer.println(smClient.getString("hostManagerServlet.exception",
e.toString()));
}
- return;
}
}
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Wed
May 10 14:42:57 2017
@@ -400,7 +400,6 @@ public class JAASMemoryLoginModule exten
digester.parse(file);
} catch (Exception e) {
log.warn("Error processing configuration file " +
file.getAbsolutePath(), e);
- return;
} finally {
digester.reset();
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Wed May 10
14:42:57 2017
@@ -929,7 +929,6 @@ public class Tomcat {
context.getPipeline().addValve(new
NonLoginAuthenticator());
}
} catch (ClassCastException e) {
- return;
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
Wed May 10 14:42:57 2017
@@ -232,7 +232,6 @@ public class NioReplicationTask extends
if (count < 0) {
remoteEof(key);
- return;
}
}
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Wed May
10 14:42:57 2017
@@ -400,7 +400,6 @@ public class MemoryUserDatabase implemen
digester.parse(is);
} catch (IOException ioe) {
log.error(sm.getString("memoryUserDatabase.fileNotFound",
pathName));
- return;
}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed May
10 14:42:57 2017
@@ -702,7 +702,6 @@ class Http2UpgradeHandler extends Abstra
synchronized (socketWrapper) {
if (socketWrapper.flush(false)) {
socketWrapper.registerWriteInterest();
- return;
}
}
}
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Wed May 10
14:42:57 2017
@@ -414,7 +414,6 @@ public class JspServlet extends HttpServ
jspUri));
}
}
- return;
}
Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Wed May 10 14:42:57 2017
@@ -209,7 +209,6 @@ public class FileHandler
}
} catch (Exception e) {
reportError(null, e, ErrorManager.WRITE_FAILURE);
- return;
}
} finally {
writerLock.readLock().unlock();
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Wed May 10
14:42:57 2017
@@ -121,8 +121,6 @@ public final class UDecoder {
}
mb.setEnd( idx );
-
- return;
}
// -------------------- Additional methods --------------------
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java Wed May 10
14:42:57 2017
@@ -147,7 +147,6 @@ public class Cookie {
if (b == SEMICOLON_BYTE || b == COMMA_BYTE) {
parseCookieRfc2109(bb, serverCookies, version);
}
- return;
} else {
// Unrecognised version.
// Ignore this header.
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=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Wed May 10
14:42:57 2017
@@ -700,7 +700,6 @@ public class Registry implements Registr
}
loadDescriptors(pkg, classLoader);
}
- return;
}
private ModelerSource getModelerSource( String type )
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
Wed May 10 14:42:57 2017
@@ -72,14 +72,11 @@ public abstract class PojoEndpointBase e
"pojoEndpointBase.onOpenFail",
pojo.getClass().getName()), e);
handleOnOpenOrCloseError(session, e);
- return;
} catch (InvocationTargetException e) {
Throwable cause = e.getCause();
handleOnOpenOrCloseError(session, cause);
- return;
} catch (Throwable t) {
handleOnOpenOrCloseError(session, t);
- return;
}
}
}
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
Wed May 10 14:42:57 2017
@@ -74,7 +74,6 @@ public class TestDataIntegrity {
System.out.println("Thread["+this.getName()+"] sent
"+msgCount+" messages in "+(System.currentTimeMillis()-start)+" ms.");
}catch ( Exception x ) {
x.printStackTrace();
- return;
}
}
};
@@ -102,7 +101,6 @@ public class TestDataIntegrity {
System.out.println("Thread["+this.getName()+"]
sent "+msgCount+" messages in "+(System.currentTimeMillis()-start)+" ms.");
}catch ( Exception x ) {
x.printStackTrace();
- return;
}
}
};
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
Wed May 10 14:42:57 2017
@@ -127,7 +127,6 @@ public class TestMulticastPackages {
System.out.println("Thread["+this.getName()+"] sent
"+msgCount+" messages in "+(System.currentTimeMillis()-start)+" ms.");
}catch ( Exception x ) {
x.printStackTrace();
- return;
}
}
};
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java?rev=1794729&r1=1794728&r2=1794729&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
Wed May 10 14:42:57 2017
@@ -119,7 +119,6 @@ public class TestUdpPackages {
System.out.println("Thread["+this.getName()+"] sent
"+msgCount+" messages in "+(System.currentTimeMillis()-start)+" ms.");
}catch ( Exception x ) {
x.printStackTrace();
- return;
}
}
};
@@ -168,7 +167,6 @@ public class TestUdpPackages {
System.out.println("Thread["+this.getName()+"] sent
"+msgCount+" messages in "+(System.currentTimeMillis()-start)+" ms.");
}catch ( Exception x ) {
x.printStackTrace();
- return;
}
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
