Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 2906 - Added support of entering notification by #streamChild()"
[yangtools.git]
/
yang
/
yang-data-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
data
/
impl
/
schema
/
tree
/
SchemaAwareApplyOperation.java
diff --git
a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java
b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java
index b691f9f20a2146769ea6f1fbd84e39aa4aa5c0b2..80ef74cf9a3a8b9bcc44e0fdbec3b514237882db 100644
(file)
--- a/
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java
+++ b/
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java
@@
-191,7
+191,7
@@
abstract class SchemaAwareApplyOperation extends ModificationApplyOperation {
case TOUCH:
Preconditions.checkArgument(currentMeta.isPresent(), "Metadata not available for modification",
modification);
case TOUCH:
Preconditions.checkArgument(currentMeta.isPresent(), "Metadata not available for modification",
modification);
- return modification.setSnapshot(Optional.of(apply
SubtreeChange
(modification, currentMeta.get(),
+ return modification.setSnapshot(Optional.of(apply
Touch
(modification, currentMeta.get(),
version)));
case MERGE:
final TreeNode result;
version)));
case MERGE:
final TreeNode result;
@@
-240,7
+240,7
@@
abstract class SchemaAwareApplyOperation extends ModificationApplyOperation {
* @param version New subtree version of parent node
* @return A sealed TreeNode representing applied operation.
*/
* @param version New subtree version of parent node
* @return A sealed TreeNode representing applied operation.
*/
- protected abstract TreeNode apply
SubtreeChange
(ModifiedNode modification, TreeNode currentMeta, Version version);
+ protected abstract TreeNode apply
Touch
(ModifiedNode modification, TreeNode currentMeta, Version version);
/**
*
/**
*