Merge tag 'MOA-ID-3.4.2'

1 files changed, 5 insertions, 4 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java
index 8d36e81bb..df43316ca 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java
@@ -36,7 +36,7 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.SessionCallback;
-import org.springframework.data.redis.serializer.JacksonJsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.stereotype.Service;
 
 import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
@@ -58,7 +58,7 @@ public class RedisTransactionStorage implements ITransactionStorage {
 	protected AuthConfiguration authConfig;
 	
 	@Autowired
-	private JacksonJsonRedisSerializer assertionStoreSerializer;
+	private RedisSerializer<AssertionStore> assertionStoreSerializer;
 	
     public RedisTemplate<String, Object> getTemplate(){
     	return this.redisTemplate;
@@ -69,10 +69,11 @@ public class RedisTransactionStorage implements ITransactionStorage {
     }
 	
 	public boolean containsKey(String key) {
+		
 		try {
 			searchInDatabase(key);
 			return true;
-			
+										
 		} catch (MOADatabaseException e) {
 			return false;
 		}
@@ -371,7 +372,7 @@ public void putRaw(String key, Object element) throws EAAFException {
 				+ " found. Process gets stopped.");
 		
 	}
-	redisTemplate.opsForValue().set(as.getArtifact(), new String(assertionStoreSerializer.serialize(element)),expTime,TimeUnit.MILLISECONDS);
+	redisTemplate.opsForValue().set(as.getArtifact(), new String(assertionStoreSerializer.serialize(as)),expTime,TimeUnit.MILLISECONDS);
 	
 }