Merge branch 'moa-id-3.0.0-snapshot' into moa-id-3.2_(OPB)

2 files changed, 9 insertions, 9 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java
index bfed65ae2..5487152cf 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java
@@ -26,7 +26,6 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
-import java.util.List;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -34,7 +33,6 @@ import javax.xml.bind.Unmarshaller;
 
 import org.apache.commons.lang3.StringEscapeUtils;
 
-
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandator;
 import at.gv.e_government.reference.namespace.persondata._20020228_.CorporateBodyType;
@@ -44,7 +42,6 @@ import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.auth.exception.ServiceException;
 import at.gv.egovernment.moa.id.client.SZRGWClientException;
-
 import at.gv.egovernment.moa.id.commons.db.StatisticLogDBUtils;
 import at.gv.egovernment.moa.id.commons.db.dao.statistic.StatisticLog;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
@@ -68,7 +65,7 @@ public class StatisticLogger {
 	private static final String MANTATORTYPE_JUR = "jur";
 	private static final String MANTATORTYPE_NAT = "nat";
 	
-	private static final int MAXERRORLENGTH = 250;
+	private static final int MAXERRORLENGTH = 200;
 	
 	private static final String ERRORTYPE_UNKNOWN = "unkown";
 	private static final String ERRORTYPE_BKU = "bku";
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
index 43f4f90ff..fe24d45dd 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
@@ -197,11 +197,6 @@ public class AuthServlet extends HttpServlet {
 					procExc.getCause() instanceof TaskExecutionException) {
 				TaskExecutionException taskExc = (TaskExecutionException) procExc.getCause();
 				loggedException = taskExc.getOriginalException();	
-				if (Logger.isDebugEnabled() || Logger.isTraceEnabled()) {
-					Logger.error(exceptionThrown.getMessage(), exceptionThrown);
-					
-				} else
-					Logger.error(exceptionThrown.getMessage());
 								
 			}			
 		}
@@ -213,6 +208,14 @@ public class AuthServlet extends HttpServlet {
 		if (!(loggedException instanceof MOAIDException)) {
 			Logger.error("Receive an internal error: Message=" + loggedException.getMessage(), loggedException);
 			
+		} else {
+			if (Logger.isDebugEnabled() || Logger.isTraceEnabled()) {
+				Logger.error(loggedException.getMessage(), loggedException);
+			
+			} else {
+				Logger.error(loggedException.getMessage());
+			
+			}			
 		}
 		
 		IExceptionStore store = DBExceptionStoreImpl.getStore();