Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix clustering versions"
[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 9a61e98c229e52dc15a94c1fc181307cd44ac8fe..3ceeb7e44db980855d4afad4b05d1489b0135f96 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
@@
-41,7
+41,7
@@
public abstract class AbstractDataModification<P extends Path<P>, D> implements
private final Map<P, D> unmodifiable_operationalUpdate;
private final Set<P> unmodifiable_configurationRemove;
private final Set<P> unmodifiable_OperationalRemove;
private final Map<P, D> unmodifiable_operationalUpdate;
private final Set<P> unmodifiable_configurationRemove;
private final Set<P> unmodifiable_OperationalRemove;
- private DataReader<P, D> reader;
+ private
final
DataReader<P, D> reader;
public AbstractDataModification(DataReader<P, D> reader) {
this.reader = reader;
public AbstractDataModification(DataReader<P, D> reader) {
this.reader = reader;
@@
-75,7
+75,6
@@
public abstract class AbstractDataModification<P extends Path<P>, D> implements
}
configurationUpdate.put(path, mergeConfigurationData(path,original, data));
}
configurationUpdate.put(path, mergeConfigurationData(path,original, data));
- configurationRemove.remove(path);
}
@Override
}
@Override
@@
-86,12
+85,6
@@
public abstract class AbstractDataModification<P extends Path<P>, D> implements
operationalCreated.put(path, data);
}
operationalUpdate.put(path, mergeOperationalData(path,original,data));
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
}
@Override
@@
-102,11
+95,6
@@
public abstract class AbstractDataModification<P extends Path<P>, D> implements
operationalRemove.put(path, path);
}
operationalRemove.put(path, path);
}
- @Override
- public final void removeRuntimeData(P path) {
- removeOperationalData(path);
- }
-
@Override
public final void removeConfigurationData(P path) {
checkMutable();
@Override
public final void removeConfigurationData(P path) {
checkMutable();
@@
-196,11
+184,11
@@
public abstract class AbstractDataModification<P extends Path<P>, D> implements
}
return null;
}
}
return null;
}
-
+
protected D mergeOperationalData(P path,D stored, D modified) {
return modified;
}
protected D mergeOperationalData(P path,D stored, D modified) {
return modified;
}
-
+
protected D mergeConfigurationData(P path,D stored, D modified) {
return modified;
}
protected D mergeConfigurationData(P path,D stored, D modified) {
return modified;
}