VOL-1387 : Fixed issue introduced with watch mechanism submission
- Added flag to determine when a revision is watched
- Added flag to determine when a revision is stored
- Refactored confusing method names for Set/GetChildren
- Fixed issue with deletion of devices due to previous submission
Change-Id: I68c46951f9d40d47e4e74854bba449c9fec4a427
diff --git a/db/model/merge.go b/db/model/merge.go
index e40f98b..b230076 100644
--- a/db/model/merge.go
+++ b/db/model/merge.go
@@ -102,9 +102,9 @@
configChanged = true
}
- //newChildren := reflect.ValueOf(dstRev.GetChildren()).Interface().(map[string][]Revision)
+ //newChildren := reflect.ValueOf(dstRev.GetAllChildren()).Interface().(map[string][]Revision)
newChildren := make(map[string][]Revision)
- for entryName, childrenEntry := range dstRev.GetChildren() {
+ for entryName, childrenEntry := range dstRev.GetAllChildren() {
//newRev.Children[entryName] = append(newRev.Children[entryName], childrenEntry...)
newChildren[entryName] = make([]Revision, len(childrenEntry))
copy(newChildren[entryName], childrenEntry)
@@ -113,9 +113,9 @@
childrenFields := ChildrenFields(forkRev.GetData())
for fieldName, field := range childrenFields {
- forkList := forkRev.GetChildren()[fieldName]
- srcList := srcRev.GetChildren()[fieldName]
- dstList := dstRev.GetChildren()[fieldName]
+ forkList := forkRev.GetChildren(fieldName)
+ srcList := srcRev.GetChildren(fieldName)
+ dstList := dstRev.GetChildren(fieldName)
if revisionsAreEqual(dstList, srcList) {
for _, rev := range srcList {