fix bug in PVP RedirectBinding decoder

1 files changed, 18 insertions, 11 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/RedirectBinding.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/RedirectBinding.java
index 1d13cbd07..7278c9c6c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/RedirectBinding.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/RedirectBinding.java
@@ -57,7 +57,7 @@ import at.gv.egovernment.moa.id.protocols.pvp2x.messages.InboundMessage;
 import at.gv.egovernment.moa.id.protocols.pvp2x.messages.InboundMessageInterface;
 import at.gv.egovernment.moa.id.protocols.pvp2x.messages.MOARequest;
 import at.gv.egovernment.moa.id.protocols.pvp2x.messages.MOAResponse;
-import at.gv.egovernment.moa.id.protocols.pvp2x.metadata.MOAMetadataProvider;
+import at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IMOARefreshableMetadataProvider;
 import at.gv.egovernment.moa.id.protocols.pvp2x.verification.TrustEngineFactory;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
@@ -180,20 +180,27 @@ public class RedirectBinding implements IDecoder, IEncoder {
 			if (MiscUtil.isEmpty(messageContext.getInboundMessageIssuer())) {
 				throw e;
 			
-			}			
-			Logger.debug("PVP2X message validation FAILED. Relead metadata for entityID: " + messageContext.getPeerEntityId());
-			if (!MOAMetadataProvider.getInstance().refreshMetadataProvider(messageContext.getInboundMessageIssuer()))
-				throw e;
+			}
 			
-			else {
-				Logger.trace("PVP2X metadata reload finished. Check validate message again.");
-				decode.decode(messageContext);		
+			if (metadataProvider instanceof IMOARefreshableMetadataProvider) {
+				Logger.debug("PVP2X message validation FAILED. Relead metadata for entityID: " + messageContext.getPeerEntityId());
+				if (!((IMOARefreshableMetadataProvider) metadataProvider).refreshMetadataProvider(messageContext.getInboundMessageIssuer()))
+					throw e;
+				
+				else {
+					Logger.trace("PVP2X metadata reload finished. Check validate message again.");
+					decode.decode(messageContext);		
 
-				//check signature
-				signatureRule.evaluate(messageContext);					
+					//check signature
+					signatureRule.evaluate(messageContext);					
 										
+				}
+				Logger.trace("Second PVP2X message validation finished");
+				
+			} else {
+				throw e;
+				
 			}
-			Logger.trace("Second PVP2X message validation finished");
 		}		
 					
 		InboundMessage msg = null;