Merge remote-tracking branch 'remotes/origin/moapid-3.2-opb-redis' into eIDAS_node_implementation

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/SingleLogOutAction.java

1 files changed, 19 insertions, 1 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/ITransactionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/ITransactionStorage.java
index 493f24ee8..53a7f4f5e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/ITransactionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/ITransactionStorage.java
@@ -48,9 +48,10 @@ public interface ITransactionStorage {
 	 * @param key Id which identifiers the data object
 	 * @param value Data object which should be stored. 
 	 *              This data must implement the <code>java.io.Serializable</code> interface
+	 * @param timeout_ms Defines the period of time a data object is kept within the storage
 	 * @throws MOADatabaseException In case of store operation failed
 	 */
-	public void put(String key, Object value) throws MOADatabaseException;
+	public void put(String key, Object value, int timeout_ms) throws MOADatabaseException;
 	
 	/**
 	 * Get a data object from transaction storage
@@ -110,4 +111,21 @@ public interface ITransactionStorage {
 	 */
 	public List<String> clean(Date now, long dataTimeOut);
 	
+	
+	/**
+	 * Get whole AssertionStoreObject, required for SLO
+	 * 
+	 * @param key key Id which identifiers the data object
+	 * @return The transaction-data object, or null
+	 * @throws MOADatabaseException In case of load operation failed
+	 */
+	public Object getAssertionStore(String key) throws MOADatabaseException;
+	
+	/**
+	 * Put whole AssertionStoreObject to db, required for SLO
+	 * 
+	 * @param element assertion store object
+	 */
+	public void putAssertionStore(Object element) throws MOADatabaseException;
+	
 }