From 39f3824eaee58ee4d0f907904f431ec94a5ad526 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 16 Oct 2014 14:02:50 +0200
Subject: [client] dont create a huge error box when thrift communication to
 masterserver failed

---
 dozentenmodul/src/main/java/gui/intro/Login_GUI.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 593c5e60..dcaafab5 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -330,7 +330,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;
 			}
 
-- 
cgit v1.2.3-55-g7522


From 4ee44059525793d2ecec8d3a0b5b9524178734c0 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 16 Oct 2014 14:24:22 +0200
Subject: [client] sanity check SessionData.session.getServerAdress() before
 making the request :)

---
 dozentenmodul/src/main/java/util/News.java | 6 ++++++
 1 file changed, 6 insertions(+)

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;
-- 
cgit v1.2.3-55-g7522