X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-common-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fcommon%2Fimpl%2FAbstractDataModification.java;h=3ceeb7e44db980855d4afad4b05d1489b0135f96;hb=d9de6c2ddfb30eb2eee782c229f6e03cef352bbd;hp=9a61e98c229e52dc15a94c1fc181307cd44ac8fe;hpb=9303b14b9dba1a940f0d0a6fe1604bfcd0f9e294;p=controller.git 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 9a61e98c22..3ceeb7e44d 100644 --- 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 @@ -41,7 +41,7 @@ public abstract class AbstractDataModification

, D> implements private final Map unmodifiable_operationalUpdate; private final Set

unmodifiable_configurationRemove; private final Set

unmodifiable_OperationalRemove; - private DataReader reader; + private final DataReader reader; public AbstractDataModification(DataReader reader) { this.reader = reader; @@ -75,7 +75,6 @@ public abstract class AbstractDataModification

, D> implements } configurationUpdate.put(path, mergeConfigurationData(path,original, data)); - configurationRemove.remove(path); } @Override @@ -86,12 +85,6 @@ public abstract class AbstractDataModification

, D> implements operationalCreated.put(path, data); } operationalUpdate.put(path, mergeOperationalData(path,original,data)); - operationalRemove.remove(path); - } - - @Override - public final void putRuntimeData(P path, D data) { - putOperationalData(path, data); } @Override @@ -102,11 +95,6 @@ public abstract class AbstractDataModification

, D> implements operationalRemove.put(path, path); } - @Override - public final void removeRuntimeData(P path) { - removeOperationalData(path); - } - @Override public final void removeConfigurationData(P path) { checkMutable(); @@ -196,11 +184,11 @@ public abstract class AbstractDataModification

, D> implements } return null; } - + protected D mergeOperationalData(P path,D stored, D modified) { return modified; } - + protected D mergeConfigurationData(P path,D stored, D modified) { return modified; }