1 files changed, 16 insertions, 17 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
index a2fe5c01b..7f73b1ed7 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
@@ -139,7 +139,7 @@ public class PostBinding implements IDecoder, IEncoder {
 	}
 
 	public InboundMessageInterface decode(HttpServletRequest req,
-			HttpServletResponse resp) throws MessageDecodingException,
+			HttpServletResponse resp, boolean isSPEndPoint) throws MessageDecodingException,
 			SecurityException {
 
 		HTTPPostDecoder decode = new HTTPPostDecoder(new BasicParserPool());
@@ -152,39 +152,38 @@ public class PostBinding implements IDecoder, IEncoder {
 		} catch (ConfigurationException e) {
 			throw new SecurityException(e);
 		}
-		
-		decode.decode(messageContext);		
-				
+							
 		messageContext.setMetadataProvider(MOAMetadataProvider.getInstance());
 		
-		InboundMessage msg = null;
+		//set metadata descriptor type
+		if (isSPEndPoint)
+			messageContext.setPeerEntityRole(IDPSSODescriptor.DEFAULT_ELEMENT_NAME);
+		else
+			messageContext.setPeerEntityRole(SPSSODescriptor.DEFAULT_ELEMENT_NAME);
 		
-		if (messageContext.getInboundMessage() instanceof RequestAbstractType) {
-			messageContext.setPeerEntityRole(SPSSODescriptor.DEFAULT_ELEMENT_NAME);			
-			
+		decode.decode(messageContext);
+		
+		InboundMessage msg = null;		
+		if (messageContext.getInboundMessage() instanceof RequestAbstractType) {			
 			RequestAbstractType inboundMessage = (RequestAbstractType) messageContext
 					.getInboundMessage();			
 			msg = new MOARequest(inboundMessage, getSAML2BindingName());
 			
-		} else if (messageContext.getInboundMessage() instanceof Response){
-			messageContext.setPeerEntityRole(IDPSSODescriptor.DEFAULT_ELEMENT_NAME);
-			
-			Response inboundMessage = (Response) messageContext.getInboundMessage();			
+		} else if (messageContext.getInboundMessage() instanceof StatusResponseType){
+			StatusResponseType inboundMessage = (StatusResponseType) messageContext.getInboundMessage();			
 			msg = new MOAResponse(inboundMessage);
 			
 		} else
 			//create empty container if request type is unknown
 			msg = new InboundMessage();
-		
-		msg.setVerified(false);
-		
-		decode.decode(messageContext);
+				
 		if (messageContext.getPeerEntityMetadata() != null)
 			msg.setEntityID(messageContext.getPeerEntityMetadata().getEntityID());
 		
 		else
 			Logger.info("No Metadata found for OA with EntityID " + messageContext.getInboundMessageIssuer());
-				
+		
+		msg.setVerified(false);
 		msg.setRelayState(messageContext.getRelayState());
 		
 		return msg;