1 files changed, 8 insertions, 8 deletions
diff --git a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigPropertyDaoImpl.java b/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigPropertyDaoImpl.java
index 752c7dc09..dfb1f542f 100644
--- a/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigPropertyDaoImpl.java
+++ b/id/server/moa-id-commons/src/main/java/com/datentechnik/moa/id/conf/persistence/dal/ConfigPropertyDaoImpl.java
@@ -16,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional;
  * Database backed implementation of the DAO interface
  * 
  */
-
 @Transactional("transactionManager")
 public class ConfigPropertyDaoImpl implements ConfigPropertyDao {
 
@@ -27,14 +26,19 @@ public class ConfigPropertyDaoImpl implements ConfigPropertyDao {
 
 	@Override
 	public void saveProperty(ConfigProperty property) {
+		this.saveProperty(property, false);
+	}
+
+	@Override
+	public void saveProperty(ConfigProperty property, boolean overwrite) {
 		if (null == em) {
 			log.error("No EntityManager set!");
 			return;
 		}
 
-		if (em.find(ConfigProperty.class, property.getKey()) != null) {
-			log.trace("Property '{}' already exists!", property.toString());
-			// em.merge(property);
+		log.debug("Storing '{}'.", property.toString());
+		if (overwrite) {
+			em.merge(property);
 		} else {
 			log.debug("Storing '{}'.", property.toString());
 			em.persist(property);
@@ -93,11 +97,7 @@ public class ConfigPropertyDaoImpl implements ConfigPropertyDao {
 	@Override
 	public void delete(String key) {
 		log.debug("Deleting entry with key '{}'.", key);
-		try{
 		em.remove(em.find(ConfigProperty.class, key));
-		}catch (IllegalArgumentException e){
-			log.trace("Error while deleting entry with key '{}':" + e.getMessage(), key);
-		}
 	}
 
 }