diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-03-06 12:56:43 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-03-06 12:56:43 +0100 |
| commit | bfbafd2a1fd8dc9e8f36b1cf7ea665e7385b47bf (patch) | |
| tree | fc528b9358a613e61b71db8f7fe17abfb0207ea4 /id | |
| parent | 402eeaea787d7b6197c31852b6bc4b6eea7bc278 (diff) | |
| download | moa-id-spss-bfbafd2a1fd8dc9e8f36b1cf7ea665e7385b47bf.tar.gz moa-id-spss-bfbafd2a1fd8dc9e8f36b1cf7ea665e7385b47bf.tar.bz2 moa-id-spss-bfbafd2a1fd8dc9e8f36b1cf7ea665e7385b47bf.zip | |
Fix NullPointer exception
Diffstat (limited to 'id')
3 files changed, 3 insertions, 3 deletions
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; |