Make sure transaction applies whole removal list

[controller.git] / opendaylight / md-sal / sal-common-impl / src / main / java / org / opendaylight / controller / md / sal / common / impl / AbstractDataModification.java

diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java
index bee863321fdb1055887c35ff4a3c72e68939ca7e..4b6a0185ab81ecc1bdaf2799de15b1a6af33ff7b 100644 (file)
--- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java
+++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.controller.md.sal.common.impl;
 
 import static org.opendaylight.controller.md.sal.common.api.TransactionStatus.NEW;
@@ -10,8 +17,9 @@ import java.util.concurrent.ConcurrentMap;
 
 import org.opendaylight.controller.md.sal.common.api.data.DataModification;
 import org.opendaylight.controller.md.sal.common.api.data.DataReader;
+import org.opendaylight.yangtools.concepts.Path;
 
-public abstract class AbstractDataModification<P /* extends Path<P> */, D> implements DataModification<P, D> {
+public abstract class AbstractDataModification<P extends Path<P>, D> implements DataModification<P, D> {
 
     private final ConcurrentMap<P, D> operationalOriginal;
     private final ConcurrentMap<P, D> configurationOriginal;
@@ -56,29 +64,27 @@ public abstract class AbstractDataModification<P /* extends Path<P> */, D> imple
         unmodifiable_operationalUpdate = Collections.unmodifiableMap(operationalUpdate);
         unmodifiable_configurationRemove = Collections.unmodifiableSet(configurationRemove.keySet());
         unmodifiable_OperationalRemove = Collections.unmodifiableSet(operationalRemove.keySet());
-
     }
 
     @Override
     public final void putConfigurationData(P path, D data) {
         checkMutable();
-
-        if (!hasConfigurationOriginal(path)) {
+        D original = null;
+        if ((original = getConfigurationOriginal(path)) == null) {
             configurationCreated.put(path, data);
         }
 
-        configurationUpdate.put(path, data);
-        configurationRemove.remove(path);
+        configurationUpdate.put(path, mergeConfigurationData(path,original, data));
     }
 
     @Override
     public final void putOperationalData(P path, D data) {
         checkMutable();
-        if (!hasOperationalOriginal(path)) {
+        D original = null;
+        if ((original = getOperationalOriginal(path)) == null) {
             operationalCreated.put(path, data);
         }
-        operationalUpdate.put(path, data);
-        operationalRemove.remove(path);
+        operationalUpdate.put(path, mergeOperationalData(path,original,data));
     }
 
     @Override
@@ -89,7 +95,7 @@ public abstract class AbstractDataModification<P /* extends Path<P> */, D> imple
     @Override
     public final void removeOperationalData(P path) {
         checkMutable();
-        hasOperationalOriginal(path);
+        getOperationalOriginal(path);
         operationalUpdate.remove(path);
         operationalRemove.put(path, path);
     }
@@ -102,7 +108,7 @@ public abstract class AbstractDataModification<P /* extends Path<P> */, D> imple
     @Override
     public final void removeConfigurationData(P path) {
         checkMutable();
-        hasConfigurationOriginal(path);
+        getConfigurationOriginal(path);
         configurationUpdate.remove(path);
         configurationRemove.put(path, path);
     }
@@ -163,27 +169,37 @@ public abstract class AbstractDataModification<P /* extends Path<P> */, D> imple
         return reader.readConfigurationData(path);
     }
 
-    private boolean hasConfigurationOriginal(P path) {
-        if (configurationOriginal.containsKey(path)) {
-            return true;
+    private D getConfigurationOriginal(P path) {
+        D data = configurationOriginal.get(path);
+        if (data != null) {
+            return data;
         }
-        D data = reader.readConfigurationData(path);
+        data = reader.readConfigurationData(path);
         if (data != null) {
             configurationOriginal.putIfAbsent(path, data);
-            return true;
+            return data;
         }
-        return false;
+        return null;
     }
 
-    private boolean hasOperationalOriginal(P path) {
-        if (operationalOriginal.containsKey(path)) {
-            return true;
+    private D getOperationalOriginal(P path) {
+        D data = operationalOriginal.get(path);
+        if (data != null) {
+            return data;
         }
-        D data = reader.readOperationalData(path);
+        data = reader.readOperationalData(path);
         if (data != null) {
             operationalOriginal.putIfAbsent(path, data);
-            return true;
+            return data;
         }
-        return false;
+        return null;
+    }
+    
+    protected D mergeOperationalData(P path,D stored, D modified) {
+        return modified;
+    }
+    
+    protected D mergeConfigurationData(P path,D stored, D modified) {
+        return modified;
     }
 }