clarified types -- proper default_port via make_port;
authorwenzelm
Thu, 09 Jun 2022 00:01:34 +0200
changeset 75545 218dd201e24d
parent 75544 179a3b028b0a
child 75546 18b77e4387f3
clarified types -- proper default_port via make_port;
src/Pure/General/ssh.scala
--- a/src/Pure/General/ssh.scala	Wed Jun 08 23:49:54 2022 +0200
+++ b/src/Pure/General/ssh.scala	Thu Jun 09 00:01:34 2022 +0200
@@ -107,7 +107,7 @@
       host_key_permissive: Boolean = false,
       nominal_host: String = "",
       nominal_user: String = "",
-      nominal_port: Int = 0,
+      nominal_port: Option[Int] = None,
       on_close: () => Unit = () => ()
     ): Session = {
       val session = jsch.getSession(proper_string(user).orNull, host, make_port(port))
@@ -128,7 +128,7 @@
       new Session(options, session, on_close,
         proper_string(nominal_host) getOrElse host,
         proper_string(nominal_user) getOrElse user,
-        if (nominal_port > 0) nominal_port else port)
+        nominal_port.getOrElse(port))
     }
 
     def open_session(
@@ -153,7 +153,9 @@
         try {
           connect_session(host = fw.local_host, port = fw.local_port,
             host_key_permissive = permissive,
-            nominal_host = host, nominal_port = port, nominal_user = user, user = user,
+            nominal_host = host,
+	    nominal_port = Some(make_port(port)),
+	    nominal_user = user, user = user,
             on_close = { () => fw.close(); proxy.close() })
         }
         catch { case exn: Throwable => fw.close(); proxy.close(); throw exn }