change some log-messges

2 files changed, 13 insertions, 9 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GUILayoutBuilderServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GUILayoutBuilderServlet.java
index 1d9a57b48..3f9093a21 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GUILayoutBuilderServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GUILayoutBuilderServlet.java
@@ -103,19 +103,21 @@ public class GUILayoutBuilderServlet extends AbstractController {
 	}
 	
 	private IRequest extractPendingRequest(HttpServletRequest req) {
-		try {
-			String authURL = HTTPUtils.extractAuthURLFromRequest(req);		
+		try {		
 			String pendingReqID = StringEscapeUtils.escapeHtml(
 					req.getParameter(MOAIDAuthConstants.PARAM_TARGET_PENDINGREQUESTID));
 		
-			if (MiscUtil.isNotEmpty(pendingReqID) && authConfig.getPublicURLPrefix().contains(authURL)) {		
+			if (MiscUtil.isNotEmpty(pendingReqID)) {		
 				IRequest pendingReq = requestStorage.getPendingRequest(pendingReqID);
-				if (pendingReq != null)
+				if (pendingReq != null) {
+					Logger.trace("GUI-Layout builder: Pending-request:"
+							+ pendingReqID + " found -> Build specific template");
 					return pendingReq;
-			
+					
+				}			
 			}
 			
-			Logger.info("Prohibit GUI-Layout builder-request. No pending-request or wrong auth-URL.");
+			Logger.trace("GUI-Layout builder: No pending-request found -> Use default templates");
 			
 		} catch (Exception e) {
 			Logger.warn("GUI-Layout builder-servlet has an error during request-preprocessing.", e);
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/ProtocolFinalizationController.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/ProtocolFinalizationController.java
index a9fc994ec..0ab630dc2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/ProtocolFinalizationController.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/ProtocolFinalizationController.java
@@ -67,10 +67,12 @@ public class ProtocolFinalizationController extends AbstractAuthProtocolModulCon
 			try {				
 				//load stored exception from database
 				Throwable throwable = transactionStorage.get(errorid, Throwable.class);
-				transactionStorage.remove(errorid);
-							
+				
 				if (throwable != null) {					
-					if (pendingReq != null) {
+					//remove exception if it was found
+					transactionStorage.remove(errorid);
+					
+					if (pendingReq != null) {						
 						revisionsLogger.logEvent(pendingReq, MOAIDEventConstants.TRANSACTION_ERROR);
 	
 						//build protocol-specific error message if possible