From 8a2a441b7d35ce7b02d5f259d6311e586c2ef10d Mon Sep 17 00:00:00 2001 From: Emmanuel Bourg Date: Wed, 10 May 2017 14:42:57 +0000 Subject: [PATCH] Removed unnecessary return statements at the end of void methods git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1794729 13f79535-47bb-0310-9956-ffa450edef68 --- java/javax/servlet/http/HttpServlet.java | 1 - java/org/apache/catalina/connector/Request.java | 2 -- .../apache/catalina/ha/session/ClusterSessionListener.java | 1 - java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java | 1 - java/org/apache/catalina/loader/WebappClassLoaderBase.java | 2 -- java/org/apache/catalina/manager/ManagerServlet.java | 2 -- .../org/apache/catalina/manager/host/HostManagerServlet.java | 5 ----- java/org/apache/catalina/realm/JAASMemoryLoginModule.java | 1 - java/org/apache/catalina/startup/Tomcat.java | 1 - .../catalina/tribes/transport/nio/NioReplicationTask.java | 1 - java/org/apache/catalina/users/MemoryUserDatabase.java | 1 - java/org/apache/coyote/http2/Http2UpgradeHandler.java | 1 - java/org/apache/jasper/servlet/JspServlet.java | 1 - java/org/apache/juli/FileHandler.java | 1 - java/org/apache/tomcat/util/buf/UDecoder.java | 2 -- java/org/apache/tomcat/util/http/parser/Cookie.java | 1 - java/org/apache/tomcat/util/modeler/Registry.java | 1 - java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java | 3 --- .../catalina/tribes/test/channel/TestDataIntegrity.java | 2 -- .../catalina/tribes/test/channel/TestMulticastPackages.java | 1 - .../apache/catalina/tribes/test/channel/TestUdpPackages.java | 2 -- 21 files changed, 33 deletions(-) diff --git a/java/javax/servlet/http/HttpServlet.java b/java/javax/servlet/http/HttpServlet.java index 9f3fe92eee94..f7ea58a56766 100644 --- a/java/javax/servlet/http/HttpServlet.java +++ b/java/javax/servlet/http/HttpServlet.java @@ -593,7 +593,6 @@ protected void doTrace(HttpServletRequest req, HttpServletResponse resp) ServletOutputStream out = resp.getOutputStream(); out.print(buffer.toString()); out.close(); - return; } diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java index fbfde0eb1d72..7e935a283448 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -1456,8 +1456,6 @@ public void removeAttribute(String name) { // Notify interested application event listeners notifyAttributeRemoved(name, value); - } else { - return; } } diff --git a/java/org/apache/catalina/ha/session/ClusterSessionListener.java b/java/org/apache/catalina/ha/session/ClusterSessionListener.java index 5af24b89fc54..c2c36b4771d8 100644 --- a/java/org/apache/catalina/ha/session/ClusterSessionListener.java +++ b/java/org/apache/catalina/ha/session/ClusterSessionListener.java @@ -91,7 +91,6 @@ public void messageReceived(ClusterMessage myobj) { } } - return; } /** diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java index 96dc29bf5e48..75ad71e6e919 100644 --- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java +++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java @@ -785,7 +785,6 @@ public void messageReceived(ClusterMessage message) { } } } - return; } public int getChannelStartOptions() { diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java b/java/org/apache/catalina/loader/WebappClassLoaderBase.java index e9f0213c7da6..019c4b207fa7 100644 --- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java +++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java @@ -643,9 +643,7 @@ public void removeTransformer(ClassFileTransformer transformer) { if (this.transformers.remove(transformer)) { log.info(sm.getString("webappClassLoader.removeTransformer", transformer, getContextName())); - return; } - } protected void copyStateWithoutTransformers(WebappClassLoaderBase base) { diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java index a9856c718f65..00fdf950c2db 100644 --- a/java/org/apache/catalina/manager/ManagerServlet.java +++ b/java/org/apache/catalina/manager/ManagerServlet.java @@ -607,7 +607,6 @@ protected synchronized void save(PrintWriter writer, String path, StringManager log("managerServlet.storeConfig", e); writer.println(smClient.getString("managerServlet.exception", e.toString())); - return; } } else { String contextPath = path; @@ -630,7 +629,6 @@ protected synchronized void save(PrintWriter writer, String path, StringManager log("managerServlet.save[" + path + "]", e); writer.println(smClient.getString("managerServlet.exception", e.toString())); - return; } } } diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java b/java/org/apache/catalina/manager/host/HostManagerServlet.java index c27e0d06b6f5..96adb4176ff4 100644 --- a/java/org/apache/catalina/manager/host/HostManagerServlet.java +++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java @@ -580,9 +580,7 @@ protected void start(PrintWriter writer, String name, "hostManagerServlet.startFailed", name)); writer.println(smClient.getString( "hostManagerServlet.exception", e.toString())); - return; } - } @@ -642,9 +640,7 @@ protected void stop(PrintWriter writer, String name, name)); writer.println(smClient.getString("hostManagerServlet.exception", e.toString())); - return; } - } @@ -675,7 +671,6 @@ protected void persist(PrintWriter writer, StringManager smClient) { } else { writer.println(smClient.getString("hostManagerServlet.exception", e.toString())); } - return; } } diff --git a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java index 361de3a8291a..64b603a2f698 100644 --- a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java +++ b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java @@ -400,7 +400,6 @@ protected void load() { digester.parse(file); } catch (Exception e) { log.warn("Error processing configuration file " + file.getAbsolutePath(), e); - return; } finally { digester.reset(); } diff --git a/java/org/apache/catalina/startup/Tomcat.java b/java/org/apache/catalina/startup/Tomcat.java index f629ff20cf3b..4f2df85d5f6d 100644 --- a/java/org/apache/catalina/startup/Tomcat.java +++ b/java/org/apache/catalina/startup/Tomcat.java @@ -929,7 +929,6 @@ public void lifecycleEvent(LifecycleEvent event) { context.getPipeline().addValve(new NonLoginAuthenticator()); } } catch (ClassCastException e) { - return; } } diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java index a6ad6a252cc1..83ba44a35eb8 100644 --- a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java +++ b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java @@ -232,7 +232,6 @@ protected void drainChannel (final SelectionKey key, ObjectReader reader) throws if (count < 0) { remoteEof(key); - return; } } diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java b/java/org/apache/catalina/users/MemoryUserDatabase.java index 4730173b02f8..4f3c2b533130 100644 --- a/java/org/apache/catalina/users/MemoryUserDatabase.java +++ b/java/org/apache/catalina/users/MemoryUserDatabase.java @@ -400,7 +400,6 @@ public void open() throws Exception { digester.parse(is); } catch (IOException ioe) { log.error(sm.getString("memoryUserDatabase.fileNotFound", pathName)); - return; } } } diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java index 53319f14ecef..3ee853729288 100644 --- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java +++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java @@ -702,7 +702,6 @@ private void processWrites() throws IOException { synchronized (socketWrapper) { if (socketWrapper.flush(false)) { socketWrapper.registerWriteInterest(); - return; } } } diff --git a/java/org/apache/jasper/servlet/JspServlet.java b/java/org/apache/jasper/servlet/JspServlet.java index 92c05d732b3b..772c69c8fc24 100644 --- a/java/org/apache/jasper/servlet/JspServlet.java +++ b/java/org/apache/jasper/servlet/JspServlet.java @@ -414,7 +414,6 @@ private void handleMissingResource(HttpServletRequest request, jspUri)); } } - return; } diff --git a/java/org/apache/juli/FileHandler.java b/java/org/apache/juli/FileHandler.java index ff5016a60db3..6c7f0dc30180 100644 --- a/java/org/apache/juli/FileHandler.java +++ b/java/org/apache/juli/FileHandler.java @@ -209,7 +209,6 @@ public void publish(LogRecord record) { } } catch (Exception e) { reportError(null, e, ErrorManager.WRITE_FAILURE); - return; } } finally { writerLock.readLock().unlock(); diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java b/java/org/apache/tomcat/util/buf/UDecoder.java index d431765b91db..9d1d6fa1a116 100644 --- a/java/org/apache/tomcat/util/buf/UDecoder.java +++ b/java/org/apache/tomcat/util/buf/UDecoder.java @@ -121,8 +121,6 @@ public void convert( ByteChunk mb, boolean query ) } mb.setEnd( idx ); - - return; } // -------------------- Additional methods -------------------- diff --git a/java/org/apache/tomcat/util/http/parser/Cookie.java b/java/org/apache/tomcat/util/http/parser/Cookie.java index 98d739c4eae0..a4331e2b50de 100644 --- a/java/org/apache/tomcat/util/http/parser/Cookie.java +++ b/java/org/apache/tomcat/util/http/parser/Cookie.java @@ -147,7 +147,6 @@ public static void parseCookie(byte[] bytes, int offset, int len, if (b == SEMICOLON_BYTE || b == COMMA_BYTE) { parseCookieRfc2109(bb, serverCookies, version); } - return; } else { // Unrecognised version. // Ignore this header. diff --git a/java/org/apache/tomcat/util/modeler/Registry.java b/java/org/apache/tomcat/util/modeler/Registry.java index 0e30a08cf044..5f3e06677658 100644 --- a/java/org/apache/tomcat/util/modeler/Registry.java +++ b/java/org/apache/tomcat/util/modeler/Registry.java @@ -700,7 +700,6 @@ private void findDescriptor(Class beanClass, String type) { } loadDescriptors(pkg, classLoader); } - return; } private ModelerSource getModelerSource( String type ) diff --git a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java index 47f760371646..47110da306a8 100644 --- a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java +++ b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java @@ -72,14 +72,11 @@ protected final void doOnOpen(Session session, EndpointConfig config) { "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; } } } diff --git a/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java b/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java index 06806f995d2a..9f78833ebe58 100644 --- a/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java +++ b/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java @@ -74,7 +74,6 @@ public void run() { 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 void run() { System.out.println("Thread["+this.getName()+"] sent "+msgCount+" messages in "+(System.currentTimeMillis()-start)+" ms."); }catch ( Exception x ) { x.printStackTrace(); - return; } } }; diff --git a/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java b/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java index 7186e54b6ba5..55a6e93139e8 100644 --- a/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java +++ b/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java @@ -127,7 +127,6 @@ public void run() { System.out.println("Thread["+this.getName()+"] sent "+msgCount+" messages in "+(System.currentTimeMillis()-start)+" ms."); }catch ( Exception x ) { x.printStackTrace(); - return; } } }; diff --git a/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java b/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java index dc12e44ce24a..52d9fd8de618 100644 --- a/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java +++ b/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java @@ -119,7 +119,6 @@ public void run() { 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 void run() { System.out.println("Thread["+this.getName()+"] sent "+msgCount+" messages in "+(System.currentTimeMillis()-start)+" ms."); }catch ( Exception x ) { x.printStackTrace(); - return; } } };