commit a8a6b6461c5cc1693bb3b8175eba4bdd123c5251
author Shawn O. Pearce <sop@google.com> Wed May 13 11:40:09 2009 -0700
committer Shawn O. Pearce <sop@google.com> Wed May 13 12:02:24 2009 -0700
tree a5fb5ba89803f7b2b08205f78c1a3f8e3a98caeb
parent f5cb3c02b74614a8a4a99755bfbdc0c4390d3d96

Fix vararg warnings in GerritSshDaemon

Signed-off-by: Shawn O. Pearce <sop@google.com>

src/main/java/com/google/gerrit/server/ssh/GerritSshDaemon.java

diff --git a/src/main/java/com/google/gerrit/server/ssh/GerritSshDaemon.java b/src/main/java/com/google/gerrit/server/ssh/GerritSshDaemon.java
index 7d44430..b6201b6 100644
--- a/src/main/java/com/google/gerrit/server/ssh/GerritSshDaemon.java
+++ b/src/main/java/com/google/gerrit/server/ssh/GerritSshDaemon.java
@@ -74,9 +74,9 @@
       XsrfException, SocketException {
     final GerritServer srv = GerritServer.getInstance();
     final int myPort = Common.getGerritConfig().getSshdPort();
-    sshd = SshServer.setUpDefaultServer();
-    sshd.setPort(myPort);
-    sshd.setSessionFactory(new SessionFactory() {
+    final SshServer daemon = SshServer.setUpDefaultServer();
+    daemon.setPort(myPort);
+    daemon.setSessionFactory(new SessionFactory() {
       @Override
       protected AbstractSession createSession(final IoSession ioSession)
           throws Exception {
@@ -88,7 +88,7 @@
 
     final File sitePath = srv.getSitePath();
     if (SecurityUtils.isBouncyCastleRegistered()) {
-      sshd.setKeyPairProvider(new FileKeyPairProvider(new String[] {
+      daemon.setKeyPairProvider(new FileKeyPairProvider(new String[] {
           new File(sitePath, "ssh_host_rsa_key").getAbsolutePath(),
           new File(sitePath, "ssh_host_dsa_key").getAbsolutePath()}));
     } else {
@@ -96,24 +96,18 @@
 
       keyp = new SimpleGeneratorHostKeyProvider();
       keyp.setPath(new File(sitePath, "ssh_host_key").getAbsolutePath());
-      sshd.setKeyPairProvider(keyp);
+      daemon.setKeyPairProvider(keyp);
     }
 
-    // Always disable transparent compression. The majority of our data
-    // transfer is highly compressed Git pack files. We cannot make them
-    // any smaller than they already are.
-    //
-    sshd.setCompressionFactories(Arrays
-        .<NamedFactory<Compression>> asList(new CompressionNone.Factory()));
-
-    sshd.setUserAuthFactories(Arrays
-        .<NamedFactory<UserAuth>> asList(new UserAuthPublicKey.Factory()));
-    sshd.setPublickeyAuthenticator(new DatabasePubKeyAuth(srv));
-    sshd.setCommandFactory(new GerritCommandFactory());
-    sshd.setShellFactory(new NoShell());
+    setCompression(daemon);
+    setUserAuth(daemon);
+    daemon.setPublickeyAuthenticator(new DatabasePubKeyAuth(srv));
+    daemon.setCommandFactory(new GerritCommandFactory());
+    daemon.setShellFactory(new NoShell());
 
     try {
-      sshd.start();
+      sshd = daemon;
+      daemon.start();
       hostKeys = computeHostKeys();
       log.info("Started Gerrit SSHD on 0.0.0.0:" + myPort);
     } catch (IOException e) {
@@ -127,6 +121,22 @@
     }
   }
 
+  @SuppressWarnings("unchecked")
+  private static void setCompression(final SshServer daemon) {
+    // Always disable transparent compression. The majority of our data
+    // transfer is highly compressed Git pack files. We cannot make them
+    // any smaller than they already are.
+    //
+    daemon.setCompressionFactories(Arrays
+        .<NamedFactory<Compression>> asList(new CompressionNone.Factory()));
+  }
+
+  @SuppressWarnings("unchecked")
+  private static void setUserAuth(final SshServer daemon) {
+    daemon.setUserAuthFactories(Arrays
+        .<NamedFactory<UserAuth>> asList(new UserAuthPublicKey.Factory()));
+  }
+
   private static Collection<PublicKey> computeHostKeys() {
     final KeyPairProvider p = sshd.getKeyPairProvider();
     final List<PublicKey> keys = new ArrayList<PublicKey>(2);