1 files changed, 31 insertions, 2 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/message/InboundMessage.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/message/InboundMessage.java
index 107a856e..c21524dd 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/message/InboundMessage.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/message/InboundMessage.java
@@ -19,7 +19,13 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.impl.message;
 
+import java.io.IOException;
 import java.io.Serializable;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+
+import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
 import at.gv.egiz.eaaf.modules.pvp2.api.message.InboundMessageInterface;
 import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataProvider;
 import at.gv.egiz.eaaf.modules.pvp2.exception.NoMetadataInformationException;
@@ -28,17 +34,20 @@ import org.opensaml.saml2.metadata.provider.MetadataProviderException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
 
 public class InboundMessage implements InboundMessageInterface, Serializable {
   private static final Logger log = LoggerFactory.getLogger(InboundMessage.class);
 
   private static final long serialVersionUID = 2395131650841669663L;
 
-  private Element samlMessage = null;
+  private transient Element samlMessage = null;
   private boolean verified = false;
   private String entityID = null;
   private String relayState = null;
 
+  private String serializedSamlMessage;
+
   /**
    * Get SAML2 metadata for Entity that sends this request.
    *
@@ -90,6 +99,13 @@ public class InboundMessage implements InboundMessageInterface, Serializable {
    */
   public void setSamlMessage(final Element msg) {
     this.samlMessage = msg;
+    try {
+		this.serializedSamlMessage = DomUtils.serializeNode(msg);
+		
+	} catch (TransformerException | IOException e) {
+		log.warn("Can not serialize message",e );
+	
+	}
   }
 
   /*
@@ -129,7 +145,20 @@ public class InboundMessage implements InboundMessageInterface, Serializable {
    */
   @Override
   public Element getInboundMessage() {
-    return samlMessage;
+	if (this.samlMessage != null) {
+		return samlMessage;
+		
+	} else {
+		try {
+			return (Element) DomUtils.parseDocument(serializedSamlMessage, false, null, null);
+			
+		} catch (SAXException | IOException | ParserConfigurationException e) {
+			throw new RuntimeException(e);
+			
+		}
+		
+	}
+			
   }
 
 }