grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

copy instead of ref-map

Browse Source
This commit is contained in:
Nikolay Volf 2016-02-19 14:52:29 +03:00
parent 25bae2897b
commit 63c5a2e58f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/src/keys/directory.rs
View File

@ -473,7 +473,7 @@ impl KeyDirectory {
/// Returns key given by id if corresponding file exists and no load error occured. /// Returns key given by id if corresponding file exists and no load error occured.
/// Warns if any error occured during the key loading /// Warns if any error occured during the key loading
pub fn get(&self, id: &Uuid) -> Option<Ref<KeyFileContent>> { pub fn get(&self, id: &Uuid) -> Option<KeyFileContent> {
let path = self.key_path(id); let path = self.key_path(id);
{ {
let mut usage = self.cache_usage.borrow_mut(); let mut usage = self.cache_usage.borrow_mut();
@ -492,7 +492,10 @@ impl KeyDirectory {
} }
} }
Some(Ref::map(self.cache.borrow(), |c| c.get(id).expect("should be they key, we have just inserted or checked it"))) // todo: replace with Ref::map when it stabilized to avoid copies
Some(self.cache.borrow().get(id)
.expect("should be they key, we have just inserted or checked it")
.clone())
} }
/// Returns current path to the directory with keys /// Returns current path to the directory with keys