Fixed issue where delayed errors weren't handled correctly.

Author: Joerg Huber

SIF3InfraREST/SIF3REST/src/main/java/sif3/infra/rest/queue/LocalMessageConsumer.java

@@ -369,8 +369,16 @@ private void processResponse(ResponseInfo responseInfo)
     private void processError(ErrorInfo errorInfo)
     {
         logger.debug(consumerID + " has receive a DELAYED ERROR from its local consumer queue ID: "  + errorInfo.getMessageQueueReaderID());
-        DelayedConsumer delayedConsumer = (DelayedConsumer)minimalConsumer; 
-        delayedConsumer.onError(infraMapper.toErrorFromSIFErrorString(errorInfo.getPayload(), errorInfo.getMediaType(), new ErrorDetails(Status.INTERNAL_SERVER_ERROR.getStatusCode(), "Could not extract error from payload.", "Payload:\n"+errorInfo.getPayload())), extractDelayedReceiptInfo(errorInfo));
+        DelayedConsumer delayedConsumer = (DelayedConsumer)minimalConsumer;
+        
+        // If an error was returned then it is already unmarshalled and set in the errorInfo object. If it is null though
+        // then we set a dummy value...
+        ErrorDetails errorDetails = errorInfo.getErrorDetail();
+        if (errorDetails == null) // create dummy error as it seems something is wrong
+        {
+            errorDetails = new ErrorDetails(Status.INTERNAL_SERVER_ERROR.getStatusCode(), "Could not extract error from payload.");
+        }
+        delayedConsumer.onError(errorDetails, extractDelayedReceiptInfo(errorInfo));
     }
 
     /*

SIF3InfraREST/SIF3REST/src/main/java/sif3/infra/rest/queue/RemoteMessageQueueReader.java

@@ -364,7 +364,10 @@ private void processError(Response response)
 			//Populate ErrorInfo Object with base data.
 			ErrorInfo errorInfo = new ErrorInfo();
 			setResponseBaseData(errorInfo, response, MessageType.ERROR);
-			
+		     
+	        // response already has the error type!
+			errorInfo.setErrorDetail(response.getError());
+
 			// Is there a subscription for this Delayed ERROR type
 			LocalConsumerQueue localQueue = getQueueInfo().getLocalConsumerQueue(errorInfo.getZone().getId(), errorInfo.getContext().getId(), errorInfo.getServiceName(), errorInfo.getServiceType().name());