Skip to content

Commit f89f3d8

Browse files
committed
FISH-7502 Eclipse plug in - Payara Tools - Version number mismatch displayed when server configured without admin password.
1 parent 8a03d28 commit f89f3d8

4 files changed

Lines changed: 272 additions & 239 deletions

File tree

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/Messages.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runtimeNotValid=There is no valid Payara runtime in specified directory.
1111
#server status
1212
invalidCredentials=Invalid user name or password
1313
serverNotMatchingLocal=Running Payara domain detected but its path does not match this server
14-
serverNotMatchingRemote=${versionsNotMatching}
14+
serverNotMatchingRemote=The versions of local and remote server do not match.
1515
connectionError=Connection error when trying to communicate with server
1616

1717
facetNotSupported=Facet {0} is not supported by the server.

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/deploying/PayaraServerBehaviour.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,11 @@ public static String getVersion(PayaraServer server) throws PayaraIdeException {
324324
Future<ResultString> future = ServerAdmin.exec(server, new CommandVersion());
325325

326326
try {
327-
return future.get(30, SECONDS).getValue();
327+
ResultString result = future.get(30, SECONDS);
328+
if(!result.isAuth()) {
329+
throw new PayaraIdeException(result.getValue());
330+
}
331+
return result.getValue();
328332
} catch (InterruptedException | ExecutionException e) {
329333
throw new PayaraIdeException("Exception by calling getVersion", e);
330334
} catch (TimeoutException e) {

0 commit comments

Comments
 (0)