From 1bb5a7e0db70fb95343436155571f2037372c352 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Mon, 23 Mar 2015 13:41:33 +0100 Subject: made logging system more robust --- common/src/main/java/at/gv/egovernment/moa/logging/Logger.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'common') diff --git a/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java b/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java index 6999656ab..265ad026d 100644 --- a/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java +++ b/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java @@ -58,7 +58,14 @@ public class Logger { * @return the logger */ private static synchronized org.slf4j.Logger getLogger() { - String className = Thread.currentThread().getStackTrace()[3].getClassName(); + StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace(); + + int i; + for(i = 2; i < stacktrace.length; i++) + if(!stacktrace[i].getClassName().equals(Logger.class.getName())) + break; + + String className = stacktrace[i].getClassName(); org.slf4j.Logger logger = instances.get(className); if (logger != null) { -- cgit v1.2.3 From d28e5b6e0d0793558f3328c5a420c17bdd606104 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 16 Apr 2015 13:48:50 +0200 Subject: update library versions --- common/pom.xml | 12 ++--- id/ConfigWebTool/pom.xml | 3 -- id/oa/pom.xml | 2 - id/server/idserverlib/pom.xml | 12 ++++- id/server/moa-id-commons/pom.xml | 9 ++-- id/server/stork2-commons/pom.xml | 3 +- id/server/stork2-saml-engine/pom.xml | 5 -- pom.xml | 89 +++++++++++++++++++++++++++++++----- 8 files changed, 96 insertions(+), 39 deletions(-) (limited to 'common') diff --git a/common/pom.xml b/common/pom.xml index 72cf702bc..8f18a1b92 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -67,28 +67,24 @@ joda-time joda-time - 2.7 + ${jodatime.version} org.slf4j slf4j-api - 1.7.10 org.slf4j jcl-over-slf4j - 1.7.10 org.slf4j jul-to-slf4j - 1.7.10 - org.slf4j - slf4j-log4j12 - 1.7.10 - + org.slf4j + slf4j-log4j12 + log4j log4j diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index 827254d00..423d442d0 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -83,7 +83,6 @@ at.gv.util egovutils - 2.0.0 org.apache.cxf @@ -159,12 +158,10 @@ org.apache.struts struts2-core - 2.3.20 org.apache.struts struts2-json-plugin - 2.3.20 diff --git a/id/oa/pom.xml b/id/oa/pom.xml index c97db6db2..173019c1b 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -110,12 +110,10 @@ org.slf4j slf4j-api - 1.7.6 org.slf4j slf4j-log4j12 - 1.7.6 diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index dbfc19b68..9465b56d1 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -113,8 +113,6 @@ at.gv.util egovutils - - 2.0.0 com.sun @@ -142,6 +140,16 @@ + + + org.apache.cxf + cxf-rt-frontend-jaxws + + + org.apache.cxf + cxf-rt-transports-http + + javax.xml.bind diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index c504a7f0c..27beeaaf3 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -46,23 +46,22 @@ org.hibernate hibernate-core - 4.3.8.Final + ${hibernate.version} org.hibernate hibernate-c3p0 - 4.3.8.Final + ${hibernate.version} org.hibernate hibernate-entitymanager - 4.3.8.Final + ${hibernate.version} org.apache.commons commons-lang3 - 3.3.2 commons-httpclient @@ -122,7 +121,7 @@ mysql mysql-connector-java - 5.1.34 + ${mysql-connector.java} diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml index 81f2cf4e5..1a8dfd786 100644 --- a/id/server/stork2-commons/pom.xml +++ b/id/server/stork2-commons/pom.xml @@ -34,7 +34,7 @@ joda-time joda-time - 2.3 + ${jodatime.version} @@ -113,7 +113,6 @@ junit junit - 4.11 test diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index e5d3dc1f4..36df747e4 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -96,7 +96,6 @@ org.slf4j slf4j-api - 1.7.10 - 2.0.3-SNAPSHOT - 2.2.1-SNAPSHOT - 2.0.1-SNAPSHOT - 2.0.5-SNAPSHOT - 1.1.6-SNAPSHOT - 2.0.4-SNAPSHOT + + 2.0.3 + 2.2.1 + 2.0.1-SNAPSHOT + 2.0.5 + 1.1.6 + 2.0.4 - 4.1.5.RELEASE - 2.18.1 - + + 4.1.6.RELEASE + 2.18.1 + 2.6.5 + 1.4.5 + 3.0.4 + 2.3.20 + 2.0.0 + 1.7.12 + 4.3.8.Final + 5.1.35 + 4.11 + 2.4 + 3.4 + 4.0 + 2.7 + @@ -232,15 +247,65 @@ org.opensaml opensaml - 2.6.5 + ${opensaml.version} org.opensaml xmltooling - 1.4.5 + ${xmltooling.version} + + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + + + + + org.apache.struts + struts2-core + ${struts.version} + + + org.apache.struts + struts2-json-plugin + ${struts.version} + + + + at.gv.util + egovutils + ${egovutils.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + axis axis @@ -307,7 +372,7 @@ org.apache.httpcomponents httpclient - 4.4 + 4.4.1 dav4j -- cgit v1.2.3 From 2db59d0b99e6ca3bc9139b72fedfd9356be7e898 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Tue, 5 May 2015 12:55:56 +0200 Subject: fixed NullPointerException in Logger class triggered by empty message --- .../java/at/gv/egovernment/moa/logging/Logger.java | 31 +++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'common') diff --git a/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java b/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java index 265ad026d..7cb2e7daf 100644 --- a/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java +++ b/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java @@ -78,6 +78,19 @@ public class Logger { return logger; } + /** + * Prepare the message for printing it as string. + *

Mainly introduce because the message might be null. + * + * @param message the message + * @return the string + */ + private static String prepareMessage(Object message) { + if(null == message) + return "no message given"; + return message.toString(); + } + /** * Test, if the trace log level is enabled. * @@ -108,7 +121,7 @@ public class Logger { */ public static void trace(Object message) { org.slf4j.Logger logger = getLogger(); - logger.trace(message.toString()); + logger.trace(prepareMessage(message)); } /** @@ -141,17 +154,17 @@ public class Logger { */ public static void debug(Object message) { org.slf4j.Logger logger = getLogger(); - logger.debug(message.toString()); + logger.debug(prepareMessage(message)); } - - /** + +/** * Log an info message. * * @param message The message to log. */ public static void info(Object message) { org.slf4j.Logger logger = getLogger(); - logger.info(message.toString()); + logger.info(prepareMessage(message)); } /** @@ -161,7 +174,7 @@ public class Logger { */ public static void warn(Object message) { org.slf4j.Logger logger = getLogger(); - logger.warn(message.toString()); + logger.warn(prepareMessage(message)); } /** @@ -172,7 +185,7 @@ public class Logger { */ public static void warn(Object message, Throwable t) { org.slf4j.Logger logger = getLogger(); - logger.warn(message.toString(), t); + logger.warn(prepareMessage(message), t); } /** @@ -182,7 +195,7 @@ public class Logger { */ public static void error(Object message) { org.slf4j.Logger logger = getLogger(); - logger.error(message.toString()); + logger.error(prepareMessage(message)); } /** @@ -193,7 +206,7 @@ public class Logger { */ public static void error(Object message, Throwable t) { org.slf4j.Logger logger = getLogger(); - logger.error(message.toString(), t); + logger.error(prepareMessage(message), t); } /** -- cgit v1.2.3