From bbbca4e8e4bbb56515e6ee5de36365a008b82666 Mon Sep 17 00:00:00 2001 From: Dominik Lindner Date: Wed, 29 Jan 2020 11:35:39 +0000 Subject: [PATCH 1/2] Don't set a default port, the java gateway handles that. --- R/OMEROServer.R | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/R/OMEROServer.R b/R/OMEROServer.R index b78d560..1ef2f9b 100644 --- a/R/OMEROServer.R +++ b/R/OMEROServer.R @@ -38,7 +38,7 @@ OMEROServer <- setClass( prototype = list( host = character(0), - port= 4064L, + port = 0, username = character(0), password = character(0), credentialsFile = character(0), @@ -377,19 +377,19 @@ setMethod(f="connect", username <- cred["omero.user", 1] password <- cred["omero.pass", 1] hostname <- cred["omero.host", 1] - portnumber <- cred["omero.port", 1] + portnumber <- as.integer(cred["omero.port", 1]) } - - if (length(server@username)>0) + else { username <- server@username - if (length(server@password)>0) password <- server@password - if (length(server@host)>0) hostname <- server@host - if (server@port>0) - portnumber <- server@port + portnumber <- as.integer(server@port) + } - lc <- new(LoginCredentials, username, password, hostname, as.integer(portnumber)) + if (portnumber > 0) + lc <- new(LoginCredentials, username, password, hostname, portnumber) + else + lc <- new(LoginCredentials, username, password, hostname) lc$setApplicationName("rOMERO") if (!versioncheck) { tryCatch({ From 0ffe351a8e8260bfca357b8ae19781aabaa1de0f Mon Sep 17 00:00:00 2001 From: Dominik Lindner Date: Wed, 29 Jan 2020 11:43:05 +0000 Subject: [PATCH 2/2] Update DESCRIPTION --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 728e5c9..0444189 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: romero.gateway Type: Package -Version: 0.4.8 +Version: 0.4.8.9000 Date: 2020-01-22 Title: OMERO R Gateway Description: R Wrapper around the OMERO Java Gateway, which