summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dozentenmodul/src/main/java/gui/intro/Login_GUI.java3
-rw-r--r--dozentenmodul/src/main/java/util/News.java6
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;