Skip to content

Commit 20f5769

Browse files
Fix CLI login error
1 parent 33db9bb commit 20f5769

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

command/src/com/mirth/connect/cli/CommandLineInterface.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
import com.mirth.connect.client.core.PaginatedEventList;
5959
import com.mirth.connect.client.core.PaginatedMessageList;
6060
import com.mirth.connect.client.core.PropertiesConfigurationUtil;
61+
import com.mirth.connect.client.core.UnauthorizedException;
6162
import com.mirth.connect.donkey.model.channel.DeployedState;
6263
import com.mirth.connect.donkey.model.message.ContentType;
6364
import com.mirth.connect.donkey.model.message.Message;
@@ -179,10 +180,17 @@ private void runShell(String server, String user, String password, String script
179180
client = new Client(server);
180181
this.debug = debug;
181182

182-
LoginStatus loginStatus = client.login(user, password);
183-
184-
if (loginStatus.getStatus() != LoginStatus.Status.SUCCESS) {
185-
error("Could not login to server.", null);
183+
LoginStatus loginStatus = null;
184+
try {
185+
loginStatus = client.login(user, password);
186+
} catch (UnauthorizedException ex) {
187+
if (ex.getResponse() != null && ex.getResponse() instanceof LoginStatus) {
188+
loginStatus = (LoginStatus) ex.getResponse();
189+
}
190+
}
191+
192+
if (loginStatus == null || loginStatus.getStatus() != LoginStatus.Status.SUCCESS) {
193+
error("Could not login to server. Status: " + loginStatus.getStatus(), null);
186194
return;
187195
}
188196

0 commit comments

Comments
 (0)