From ad3e8bd9214bc93a260890df0545b18e0cea3ed7 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Thu, 22 Aug 2013 15:27:33 +0200 Subject: [PATCH] Remove unneeded null checks These null checks are not needed since the variables were previously dereferenced and if they were null a NullPointerException would have occurred then. Change-Id: Ied6a3b32b2580a0d95f74053a1867130780e208b Signed-off-by: Edwin Kempin --- .../com/google/gerrit/client/admin/PermissionEditor.java | 2 +- .../google/gerrit/client/admin/ProjectAccessEditor.java | 2 +- .../com/google/gerrit/client/changes/ChangeScreen.java | 8 +++----- .../main/java/com/google/gerrit/server/ChangeUtil.java | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java index 028fb87893..52227513af 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java @@ -280,7 +280,7 @@ public class PermissionEditor extends Composite implements Editor, validRange = null; } - if (value != null && Permission.OWNER.equals(value.getName())) { + if (Permission.OWNER.equals(value.getName())) { exclusiveGroup.setEnabled(false); } else { exclusiveGroup.setEnabled(!readOnly); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.java index 32bc46974c..49a9aa4b55 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.java @@ -120,7 +120,7 @@ public class ProjectAccessEditor extends Composite implements history.getStyle().setDisplay(Display.NONE); } - addSection.setVisible(value != null && editing && (!value.getOwnerOf().isEmpty() || value.canUpload())); + addSection.setVisible(editing && (!value.getOwnerOf().isEmpty() || value.canUpload())); } @Override diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java index 0ec34a9ea4..f2b74d6113 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java @@ -339,13 +339,11 @@ public class ChangeScreen extends Screen patchesList.addItem(Util.C.baseDiffItem()); } for (PatchSet pId : detail.getPatchSets()) { - if (patchesList != null) { - patchesList.addItem(Util.M.patchSetHeader(pId.getPatchSetId()), pId - .getId().toString()); - } + patchesList.addItem(Util.M.patchSetHeader(pId.getPatchSetId()), pId + .getId().toString()); } - if (diffBaseId != null && patchesList != null) { + if (diffBaseId != null) { patchesList.setSelectedIndex(diffBaseId.get()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java index b888e012fe..bdba433ed3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java @@ -418,7 +418,7 @@ public class ChangeUtil { final GitReferenceUpdated gitRefUpdated, final ReviewDb db) throws NoSuchChangeException, OrmException, IOException { final PatchSet.Id patchSetId = patch.getId(); - if (patch == null || !patch.isDraft()) { + if (!patch.isDraft()) { throw new NoSuchChangeException(patchSetId.getParentKey()); }