1 files changed, 22 insertions, 16 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
index 20f4c6ea..a8b0a961 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
@@ -19,6 +19,20 @@
 
 package at.gv.egiz.eaaf.core.impl.idp.controller;
 
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.text.StringEscapeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.SerializationUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
 import at.gv.egiz.components.eventlog.api.EventConstants;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.IRequestStorage;
@@ -30,18 +44,6 @@ import at.gv.egiz.eaaf.core.api.utils.IPendingRequestIdGenerationStrategy;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.services.ProtocolAuthenticationService;
 import at.gv.egiz.eaaf.core.impl.utils.TransactionIdUtils;
-import org.apache.commons.text.StringEscapeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.SerializationUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
 /**
  * Protocol finialization end-point.
@@ -51,9 +53,12 @@ import java.io.IOException;
 @Controller
 public class ProtocolFinalizationController extends AbstractController {
   private static final Logger log = LoggerFactory.getLogger(ProtocolFinalizationController.class);
-  public static final String ENDPOINT_FINALIZEPROTOCOL = "finalizeAuthProtocol";
-  public static final String ENDPOINT_ERRORHANDLING = "errorHandling";
-  public static final String ENDPOINT_ERROR_REDIRECT = "errorRedirect";
+  public static final String ENDPOINT_FINALIZEPROTOCOL = 
+      EaafConstants.ENDPOINT_PREFIX_SECURED + "/finalizeAuthProtocol";
+  public static final String ENDPOINT_ERRORHANDLING = 
+      EaafConstants.ENDPOINT_PREFIX_SECURED + "/errorHandling";
+  public static final String ENDPOINT_ERROR_REDIRECT = 
+      EaafConstants.ENDPOINT_PREFIX_SECURED + "/errorRedirect";
 
   @Autowired(required = true)
   IRequestStorage requestStorage;
@@ -231,7 +236,8 @@ public class ProtocolFinalizationController extends AbstractController {
     final IRequest pendingReq = requestStorage.getPendingRequest(pendingRequestID);
 
     if (pendingReq == null) {
-      log.error("No PendingRequest with ID " + pendingRequestID + " found.!");
+      log.info("PendingReqId was valid but no PendingRequest with ID: {}. Looks already used", 
+          pendingRequestID);
       protAuthService.handleErrorNoRedirect(
           new EaafException(IStatusMessenger.CODES_INTERNAL_ERROR_AUTH_TIMEOUT, new Object[]{pendingRequestID,}), req,
           resp, false);