diff options
| author | Nino Breuer | 2014-10-16 14:47:04 +0200 |
|---|---|---|
| committer | Nino Breuer | 2014-10-16 14:47:04 +0200 |
| commit | 20f7dabf79785213d86c19cfa0a6d9ef242bc719 (patch) | |
| tree | 50a0b33f350880d5e507a8fee8aa2086767baf1c | |
| parent | • added possibilty to test offline, if masterserver is not reachable. to be... (diff) | |
| parent | [client] sanity check SessionData.session.getServerAdress() before making the... (diff) | |
| download | tutor-module-20f7dabf79785213d86c19cfa0a6d9ef242bc719.tar.gz tutor-module-20f7dabf79785213d86c19cfa0a6d9ef242bc719.tar.xz tutor-module-20f7dabf79785213d86c19cfa0a6d9ef242bc719.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
| -rw-r--r-- | dozentenmodul/src/main/java/gui/intro/Login_GUI.java | 3 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/util/News.java | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index 58c17cb9..60b30bbd 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -356,7 +356,8 @@ public class Login_GUI extends JFrame { } catch (TException e) { setStatus(Color.red, "Kommunikation mit Masterserver fehlgeschlagen.", - Arrays.toString(e.getStackTrace())); + null); + LOGGER.error("Thrift-communication to the masterserver failed, see trace: ", e); return; } diff --git a/dozentenmodul/src/main/java/util/News.java b/dozentenmodul/src/main/java/util/News.java index aaee7f2a..56b162ac 100644 --- a/dozentenmodul/src/main/java/util/News.java +++ b/dozentenmodul/src/main/java/util/News.java @@ -113,6 +113,12 @@ public class News { private static void init(){ // Document representing the XML Document doc = null; + String satIp = SessionData.session.getServerAdress(); + // sanity check to see if we have the satellite IP + if (satIp == null || satIp.isEmpty()) { + LOGGER.error("No satellite IP adress is set in SessionData, aborting news fetching..."); + return; + } // URL to news API URL url = null; |