1 files changed, 65 insertions, 23 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java
index f33a7549c..ff631a720 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java
@@ -53,28 +53,38 @@ public class DBTransactionStorage implements ITransactionStorage {
 		
 	}
 	
-	public void put(String key, Object value) throws MOADatabaseException {	
-		//setup AssertionStore element
-		AssertionStore element = new AssertionStore();
-		element.setArtifact(key);
-		element.setType(value.getClass().getName());
-		element.setDatatime(new Date());
-
-		//serialize the Assertion for Database storage
-		byte[] data = SerializationUtils.serialize((Serializable) value);
-		element.setAssertion(data);
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.storage.ITransactionStorage#changeKey(java.lang.String, java.lang.String, java.lang.Object)
+	 */
+	@Override
+	public void changeKey(String oldKey, String newKey, Object value) throws MOADatabaseException {
+		//search if key already exists
+		AssertionStore element = searchInDatabase(oldKey);		
+		if (element == null) {
+			Logger.info("No transaction-data with oldKey:" + oldKey 
+					+ " found. Process gets stopped.");
+			throw new MOADatabaseException("No transaction-data with oldKey:" + oldKey 
+					+ " found. Process gets stopped.");
+			
+		}
 		
-		//store AssertionStore element to Database
-		try {
-			MOASessionDBUtils.saveOrUpdate(element);
-			Logger.info(value.getClass().getName() + " with ID: " + key + " is stored in Database");
-		} catch (MOADatabaseException e) {
-			Logger.warn("Sessioninformation could not be stored.");
-			throw new MOADatabaseException(e);
+		put(element, newKey, value);
+		
+	}
+	
+	public void put(String key, Object value) throws MOADatabaseException {
+		//search if key already exists
+		AssertionStore element = searchInDatabase(key);
+		
+		//create a new entry if key does not exists already
+		if (element == null) {
+			element = new AssertionStore();
+						
 		}
 		
+		put(element, key, value);
 	}
-	 
+		 
 	public <T> T get(String key,
 			final Class<T> clazz) throws MOADatabaseException {
 
@@ -93,6 +103,9 @@ public class DBTransactionStorage implements ITransactionStorage {
 	 
 	  AssertionStore element = searchInDatabase(key);
 	  
+	  if (element == null)
+		  return null;
+	  	  
 	  if (dataTimeOut > -1) {
 		  //check timeout
 			long now = new Date().getTime();
@@ -155,13 +168,18 @@ public class DBTransactionStorage implements ITransactionStorage {
 		
 		 try {
 			AssertionStore element = searchInDatabase(key);
+			if (element == null) {
+				Logger.debug("Sessioninformation not removed! (Sessioninformation with ID=" + key 
+						+ "not found)");
+				return;
+			}
+			
 			cleanDelete(element);
-			Logger.info("Remove stored information with ID: " + key);
+			Logger.debug("Remove stored information with ID: " + key);
 			
 			
 		} catch (MOADatabaseException e) {
-			Logger.info("Sessioninformation not removed! (Sessioninformation with ID=" + key 
-					+ "not found)");
+			Logger.info("Sessioninformation not removed! (Message:"+ e.getMessage() + ")");
 
 		} catch (HibernateException e) {
 			Logger.warn("Sessioninformation not removed! (Error during Database communication)", e);
@@ -206,10 +224,34 @@ public class DBTransactionStorage implements ITransactionStorage {
 		  
 		  //Assertion requires an unique artifact
 		  if (result.size() != 1) {
-			 Logger.trace("No entries found.");
-		   	throw new MOADatabaseException("No sessioninformation found with this ID");
+			 Logger.debug("No transaction information with ID:" + artifact + " found.");
+			 return null;
+			 
 		  }
 		  
 		  return (AssertionStore) result.get(0);
 	}
+	
+	private void put(AssertionStore element, String key, Object value) throws MOADatabaseException {	
+		element.setArtifact(key);
+		element.setType(value.getClass().getName());
+		element.setDatatime(new Date());
+
+		//serialize the Assertion for Database storage
+		byte[] data = SerializationUtils.serialize((Serializable) value);
+		element.setAssertion(data);
+		
+		//store AssertionStore element to Database
+		try {
+			MOASessionDBUtils.saveOrUpdate(element);
+			Logger.debug(value.getClass().getName() + " with ID: " + key + " is stored in Database");
+			
+		} catch (MOADatabaseException e) {
+			Logger.warn("Sessioninformation could not be stored.");
+			throw new MOADatabaseException(e);
+			
+		}
+		
+	}
+
 }