zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Split Client#onlineInit method up into performHandshake and initReceiver

Browse Source
This commit is contained in:
Kai S. K. Engelbart
2020-02-12 07:53:24 +01:00
parent c697b099ee
commit 17eeed0bfb
3 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/envoy/client/ui/Startup.java
View File

@ -62,7 +62,7 @@ public class Startup {
if (args.length > 0) config.load(args);
// Check if all mandatory configuration values have been initialized
if (!config.isInitialized()) throw new EnvoyException("Server or port are not defined");
if (!config.isInitialized()) throw new EnvoyException("Configuration is not fully initialized");
} catch (Exception e) {
JOptionPane
.showMessageDialog(null, "Error loading configuration values:\n" + e.toString(), "Configuration error", JOptionPane.ERROR_MESSAGE);
@ -109,7 +109,8 @@ public class Startup {
try {
// Try entering online mode first
localDb.loadIdGenerator();
client.onlineInit(credentials, localDb, cache);
client.performHandshake(credentials, cache);
client.initReceiver(localDb, cache);
} catch (Exception e1) {
logger.warning("Could not connect to server. Trying offline mode...");
e1.printStackTrace();