Fixed bug where serviceType wasn't set or set wrongly.

Author: Joerg Huber

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

@@ -30,7 +30,6 @@
 import sif3.common.exception.UnmarshalException;
 import sif3.common.exception.UnsupportedMediaTypeExcpetion;
 import sif3.common.header.HeaderValues.ServiceType;
-import sif3.common.interfaces.Consumer;
 import sif3.common.interfaces.DelayedConsumer;
 import sif3.common.interfaces.EventConsumer;
 import sif3.common.interfaces.MinimalConsumer;
@@ -388,10 +387,9 @@ private void processError(ErrorInfo errorInfo)
      */
     private Object makeDataModelObject(MinimalConsumer miniConsumer, String payload, MediaType mediaType)
     {
-        Consumer consumer = (Consumer)miniConsumer;
         try
         {
-            return consumer.getUnmarshaller().unmarshal(payload, consumer.getMultiObjectClassInfo().getObjectType(), mediaType);
+            return miniConsumer.getUnmarshaller().unmarshal(payload, miniConsumer.getMultiObjectClassInfo().getObjectType(), mediaType);
         }
         catch (UnmarshalException ex)
         {

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

@@ -30,6 +30,7 @@
 import sif3.common.header.HeaderValues.EventAction;
 import sif3.common.header.HeaderValues.MessageType;
 import sif3.common.header.HeaderValues.ResponseAction;
+import sif3.common.header.HeaderValues.ServiceType;
 import sif3.common.header.HeaderValues.UpdateType;
 import sif3.common.header.ResponseHeaderConstants;
 import sif3.common.model.EventMetadata;
@@ -454,6 +455,7 @@ private void processEvent(Response response)
 
 				EventInfo eventInfo = new EventInfo(eventPayload, response.getMediaType(), eventAction, updateType, zone, context, metadata, getQueueReaderID());
 				eventInfo.setFingerprint(getHeaderValue(response, ResponseHeaderConstants.HDR_FINGERPRINT));
+				eventInfo.setServiceType(StringUtils.isEmpty(serviceType) ? ServiceType.OBJECT : ServiceType.valueOf(serviceType));
 
 				logger.debug(getQueueReaderID()+": Attempts to push Event to local queue...");
 				localQueue.blockingPush(eventInfo);