Merge "Remove unnecessary 'return' statements"

gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java

@@ -57,12 +57,10 @@ public class SideBySideTable extends AbstractPatchContentTable {
 
   protected void createFileCommentEditorOnSideA() {
     createCommentEditor(R_HEAD + 1, A, R_HEAD, FILE_SIDE_A);
-    return;
   }
 
   protected void createFileCommentEditorOnSideB() {
     createCommentEditor(R_HEAD + 1, B, R_HEAD, FILE_SIDE_B);
-    return;
   }
 
   @Override

gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java

@@ -90,11 +90,8 @@ public class UnifiedDiffTable extends AbstractPatchContentTable {
           if (idSideA != null && idSideA.equals(psId)) {
             rowOfTableHeaderB++;
             borderRowOfFileComment++;
-            return;
+          } else if (idSideB.equals(psId)) {
-          }
-          if (idSideB.equals(psId)) {
             borderRowOfFileComment++;
-            return;
           }
       }
     }
@@ -137,11 +134,8 @@ public class UnifiedDiffTable extends AbstractPatchContentTable {
           if (idSideA != null && idSideA.equals(psId)) {
             rowOfTableHeaderB--;
             borderRowOfFileComment--;
-            return;
+          } else if (idSideB.equals(psId)) {
-          }
-          if (idSideB.equals(psId)) {
             borderRowOfFileComment--;
-            return;
           }
       }
     }
@@ -171,7 +165,6 @@ public class UnifiedDiffTable extends AbstractPatchContentTable {
 
   protected void createFileCommentEditorOnSideA() {
     createCommentEditor(R_HEAD + 1, PC, R_HEAD, FILE_SIDE_A);
-    return;
   }
 
   protected void createFileCommentEditorOnSideB() {

gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java

@@ -104,7 +104,6 @@ final class GerritJsonServlet extends JsonServlet<GerritJsonServlet.GerritCall>
       //
       if (!call.requireXsrfValid() || !session.get().isSignedIn()) {
         call.onFailure(new NotSignedInException());
-        return;
       }
     }
   }

gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java

@@ -467,8 +467,6 @@ public class ChangeJson {
         label.value = score;
       }
     }
-
-    return;
   }
 
   private void setAllApprovals(ChangeData cd,

gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java

@@ -1179,7 +1179,6 @@ public class ReceiveCommits {
         walk.markStart(h);
         if (walk.next() == null) {
           reject(magicBranch.cmd, "no common ancestry");
-          return;
         }
       } finally {
         walk.reset();
@@ -1188,7 +1187,6 @@ public class ReceiveCommits {
     } catch (IOException e) {
       magicBranch.cmd.setResult(REJECTED_MISSING_OBJECT);
       log.error("Invalid pack upload; one or more objects weren't sent", e);
-      return;
     }
   }
 

gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java

@@ -512,7 +512,6 @@ public class QueryShell {
         obj.addProperty("type", "error");
         obj.addProperty("message", "Unsupported Json variant");
         println(obj.toString());
-        return;
     }
   }
 

gerrit-war/src/main/java/com/google/gerrit/httpd/ReviewDbDataSourceProvider.java

@@ -72,7 +72,6 @@ final class ReviewDbDataSourceProvider implements Provider<DataSource>,
       Class<?> type = Class.forName("com.mchange.v2.c3p0.DataSources");
       if (type.isInstance(ds)) {
         type.getMethod("destroy", DataSource.class).invoke(null, ds);
-        return;
       }
     } catch (Throwable bad) {
       // Oh well, its not a c3p0 pooled connection.