1 files changed, 7 insertions, 2 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataService.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataService.java
index da5ad6ab9..b5c72ef9f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataService.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataService.java
@@ -87,6 +87,7 @@ public class GetAuthenticationDataService implements Constants {
 		String statusMessageCode = null;
     String statusMessage = null;
 		String samlAssertion = "";
+		boolean useUTC = false;
 		if (requests.length > 1) {
 			// more than 1 request given as parameter
 			statusCode = "samlp:Requester";
@@ -113,8 +114,11 @@ public class GetAuthenticationDataService implements Constants {
                     requestID = request.getAttribute("RequestID");
 					String samlArtifact = DOMUtils.getText(samlArtifactElem);
 					try {
+						
             AuthenticationData authData = AuthenticationServer.getInstance().
   						getAuthenticationData(samlArtifact);
+                        
+            useUTC = authData.getUseUTC();
             // success
             samlAssertion = authData.getSamlAssertion();
             statusCode = "samlp:Success";
@@ -135,12 +139,13 @@ public class GetAuthenticationDataService implements Constants {
 	    }
 		}
     try {
-			String responseID = Random.nextRandom();
-			String issueInstant = DateTimeUtils.buildDateTime(Calendar.getInstance());
+			String responseID = Random.nextRandom();			
+			String issueInstant = DateTimeUtils.buildDateTime(Calendar.getInstance(), useUTC);
       if (statusMessage == null)
 			  statusMessage = MOAIDMessageProvider.getInstance().getMessage(statusMessageCode, null);
 	    responses[0] = new SAMLResponseBuilder().build(
 	    	responseID, requestID, issueInstant, statusCode, subStatusCode, statusMessage, samlAssertion);
+    
   	}
     catch (MOAIDException e) {
 	    AxisFault fault = AxisFault.makeFault(e);