diff options
Diffstat (limited to 'eaaf_core/src/main')
2 files changed, 13 insertions, 14 deletions
| diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java index 8e641338..6f416414 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java @@ -25,7 +25,6 @@ package at.gv.egiz.eaaf.core.impl.idp.auth.services;  import java.io.IOException;  import java.io.PrintWriter;  import java.io.StringWriter; -import java.util.Arrays;  import javax.naming.ConfigurationException;  import javax.servlet.http.HttpServletRequest; @@ -388,8 +387,16 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer  			String[] errorCodeParams = null;  			if (params == null)								  				errorCodeParams = new String[] {};				 -			else				 -				errorCodeParams = Arrays.copyOf(params, params.length, String[].class); +			else { +				errorCodeParams = new String[params.length]; +				for (int i=0; i<params.length; i++) { +					if (params[i] != null) +						errorCodeParams[i] = params[i].toString(); +					else +						errorCodeParams[i] = "'null'"; +					 +				}																		 +			} diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/TransactionIDUtils.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/TransactionIDUtils.java index bda2edc5..2e016848 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/TransactionIDUtils.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/TransactionIDUtils.java @@ -65,42 +65,34 @@ public class TransactionIDUtils {  	} -	public static void setServiceProviderId(String oaUniqueId) { -		org.apache.log4j.MDC.put(MDC_SERVICEPROVIDER_ID, oaUniqueId);		 +	public static void setServiceProviderId(String oaUniqueId) {		  		org.slf4j.MDC.put(MDC_SERVICEPROVIDER_ID, oaUniqueId);  	}  	public static void removeServiceProviderId() { -		org.apache.log4j.MDC.remove(MDC_SERVICEPROVIDER_ID);  		org.slf4j.MDC.remove(MDC_SERVICEPROVIDER_ID);  	} -	public static void setTransactionId(String pendingRequestID) {	   -		org.apache.log4j.MDC.put(MDC_TRANSACTION_ID,  -				"TID-" + pendingRequestID);		 +	public static void setTransactionId(String pendingRequestID) {	     		org.slf4j.MDC.put(MDC_TRANSACTION_ID,   				"TID-" + pendingRequestID);  	}  	public static void removeTransactionId() { -		org.apache.log4j.MDC.remove(MDC_TRANSACTION_ID);  		org.slf4j.MDC.remove(MDC_TRANSACTION_ID);  	} -	public static void setSessionId(String uniqueSessionId) {	   -		org.apache.log4j.MDC.put(MDC_SESSION_ID,  -				"SID-" + uniqueSessionId);		 +	public static void setSessionId(String uniqueSessionId) {	  	  		org.slf4j.MDC.put(MDC_SESSION_ID,   				"SID-" + uniqueSessionId);  	}  	public static void removeSessionId() { -		org.apache.log4j.MDC.remove(MDC_SESSION_ID);  		org.slf4j.MDC.remove(MDC_SESSION_ID);  	} | 
