VOL-1173 : Removed hash based storage; replaced with per device protobuf
- Ensured proxies issue callbacks instead of forcing with goroutines
- Fixed mutex issue with proxy component
Change-Id: Idabd3257c6d264c0f607ee228e406810304dab43
diff --git a/db/model/proxy_access_control.go b/db/model/proxy_access_control.go
index e9a4ffa..f6169b6 100644
--- a/db/model/proxy_access_control.go
+++ b/db/model/proxy_access_control.go
@@ -167,7 +167,7 @@
// FIXME: Forcing depth to 0 for now due to problems deep copying the data structure
// The data traversal through reflection currently corrupts the content
- return pac.getProxy().GetRoot().Get(path, "", 0, deep, txid)
+ return pac.getProxy().GetRoot().Get(path, "", depth, deep, txid)
}
// Update changes the content of the data model at the specified location with the provided data
@@ -177,7 +177,12 @@
defer pac.unlock()
log.Debugf("controlling update, stack = %s", string(debug.Stack()))
}
- return pac.getProxy().GetRoot().Update(path, data, strict, txid, nil).GetData()
+ result := pac.getProxy().GetRoot().Update(path, data, strict, txid, nil)
+
+ if result != nil {
+ return result.GetData()
+ }
+ return nil
}
// Add creates a new data model entry at the specified location with the provided data
@@ -187,8 +192,12 @@
defer pac.unlock()
log.Debugf("controlling add, stack = %s", string(debug.Stack()))
}
- return pac.getProxy().GetRoot().Add(path, data, txid, nil).GetData()
+ result := pac.getProxy().GetRoot().Add(path, data, txid, nil)
+ if result != nil {
+ return result.GetData()
+ }
+ return nil
}
// Remove discards information linked to the data model path