diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-01-30 22:36:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-30 22:36:30 +0800 |
| commit | 1c140f73820e2a915dcc61eccaeca7ea359cf07b (patch) | |
| tree | ed3c5330a14344d6c716d19306154f17cd1efcbc /swarm/api/manifest.go | |
| parent | f3c368ca736ed2884943cf87b029d305b7fc7c61 (diff) | |
| parent | e5a93bf99abc0db5efbfab17feb61cfaef5a19ed (diff) | |
| download | go-tangerine-1c140f73820e2a915dcc61eccaeca7ea359cf07b.tar.gz go-tangerine-1c140f73820e2a915dcc61eccaeca7ea359cf07b.tar.zst go-tangerine-1c140f73820e2a915dcc61eccaeca7ea359cf07b.zip | |
Merge pull request #3615 from nolash/bzzpathfix_real5
cmd/swarm, swarm/api: bzzr improve + networkid prio
Diffstat (limited to 'swarm/api/manifest.go')
| -rw-r--r-- | swarm/api/manifest.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index d6dc24c48..36c0b0436 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -302,7 +302,8 @@ func (self *manifestTrie) findPrefixOf(path string, quitC chan bool) (entry *man if (len(path) >= epl) && (path[:epl] == entry.Path) { glog.V(logger.Detail).Infof("entry.ContentType = %v", entry.ContentType) if entry.ContentType == manifestType { - if self.loadSubTrie(entry, quitC) != nil { + err := self.loadSubTrie(entry, quitC) + if err != nil { return nil, 0 } entry, pos = entry.subtrie.findPrefixOf(path[epl:], quitC) @@ -312,8 +313,6 @@ func (self *manifestTrie) findPrefixOf(path string, quitC chan bool) (entry *man } else { pos = epl } - } else { - entry = nil } return } |