From bfbafd2a1fd8dc9e8f36b1cf7ea665e7385b47bf Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 6 Mar 2014 12:56:43 +0100
Subject: Fix NullPointer exception

---
 id/ConfigWebTool/pom.xml                                                | 2 +-
 .../java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java  | 2 +-
 .../java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'id')

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index 9d99fb343..287b0b096 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -45,7 +45,7 @@
       <dependency>
     		<groupId>MOA.id.server</groupId>
     		<artifactId>moa-id-commons</artifactId>
-    		<version>1.9.98-SNAPSHOT</version>
+    		<version>2.0-RC1</version>
     	</dependency>
       <dependency>
     		<groupId>MOA.id.server</groupId>
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java
index 6f1112e2e..37135439e 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java
@@ -69,7 +69,7 @@ public class MailHelper {
 		
 		String template = readTemplateFromURL(templateurl);
 		
-		if (userdb.isIsMandateUser()) {
+		if (userdb.isIsMandateUser() != null && userdb.isIsMandateUser()) {
 			template = template.replace(PATTERN_GIVENNAME, userdb.getInstitut());
 			template = template.replace(PATTERN_FAMILYNAME, "");
 			
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
index c9fc07b70..34366b790 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
@@ -491,7 +491,7 @@ public class DispatcherServlet extends AuthServlet{
 				}
 
 			} catch (Throwable e) {
-				Logger.info("An authentication error occous: " + e.getMessage());;
+				Logger.warn("An authentication error occous: ", e);;
 				// Try handle module specific, if not possible rethrow
 				if (!info.generateErrorMessage(e, req, resp, protocolRequest)) {
 					throw e;
-- 
cgit v1.2.3