projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16133-federation-loop'
[arvados.git]
/
sdk
/
go
/
arvados
/
fs_deferred.go
diff --git
a/sdk/go/arvados/fs_deferred.go
b/sdk/go/arvados/fs_deferred.go
index 97fe68b28c77942ff1570f58fb9b035ebf942231..439eaec7c2a5dbde49f2fd2851551238a22166ec 100644
(file)
--- a/
sdk/go/arvados/fs_deferred.go
+++ b/
sdk/go/arvados/fs_deferred.go
@@
-12,10
+12,8
@@
import (
)
func deferredCollectionFS(fs FileSystem, parent inode, coll Collection) inode {
)
func deferredCollectionFS(fs FileSystem, parent inode, coll Collection) inode {
- var modTime time.Time
- if coll.ModifiedAt != nil {
- modTime = *coll.ModifiedAt
- } else {
+ modTime := coll.ModifiedAt
+ if modTime.IsZero() {
modTime = time.Now()
}
placeholder := &treenode{
modTime = time.Now()
}
placeholder := &treenode{
@@
-85,7
+83,7
@@
func (dn *deferrednode) Write(p []byte, pos filenodePtr) (int, filenodePtr, erro
return dn.realinode().Write(p, pos)
}
return dn.realinode().Write(p, pos)
}
-func (dn *deferrednode) Child(name string, replace func(inode)
inode) inode
{
+func (dn *deferrednode) Child(name string, replace func(inode)
(inode, error)) (inode, error)
{
return dn.realinode().Child(name, replace)
}
return dn.realinode().Child(name, replace)
}