From fc854d6819c9d28fae94435aa3d46cea4e169af0 Mon Sep 17 00:00:00 2001 From: Martin Spielmann Date: Mon, 22 May 2017 00:39:49 +0200 Subject: Revert "Fix nullpointer exception with unsupported URL protocol #1237" This reverts commit 51b9b7f9016899bbf8a39f6bc33a916a3d2b3838. --- src/main/java/com/gitblit/manager/ServicesManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gitblit/manager/ServicesManager.java b/src/main/java/com/gitblit/manager/ServicesManager.java index 74f58c65..b993eb66 100644 --- a/src/main/java/com/gitblit/manager/ServicesManager.java +++ b/src/main/java/com/gitblit/manager/ServicesManager.java @@ -276,7 +276,7 @@ public class ServicesManager implements IServicesManager { Iterator itr = list.iterator(); while (itr.hasNext()) { RepositoryUrl url = itr.next(); - if (url.transport != null && url.transport.equals(preferredTransport)) { + if (url.transport.equals(preferredTransport)) { itr.remove(); preferredUrl = url; break; -- cgit v1.2.3 From 31a4c54b86db8e2ac0a5694a8e7afc9af3108ec9 Mon Sep 17 00:00:00 2001 From: Martin Spielmann Date: Mon, 22 May 2017 00:42:47 +0200 Subject: Remove unused code --- src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java b/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java index 629c58eb..c0e57c35 100644 --- a/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java @@ -24,7 +24,6 @@ import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; @@ -124,9 +123,6 @@ public class SshKeysPanel extends BasePanel { "span5", keyComment)); -// final FeedbackPanel feedback = new FeedbackPanel("feedback"); -// feedback.setOutputMarkupId(true); -// addKeyForm.add(feedback); addKeyForm.add(new AjaxButton("addKeyButton") { private static final long serialVersionUID = 1L; -- cgit v1.2.3