matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add another level of error enclosure

Browse source
This commit is contained in:
Matthias Beyer 2016-06-08 15:06:18 +02:00
parent e75b524e53
commit 55e6c29275
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libimagstore/src/store.rs
View file

@ -630,9 +630,11 @@ impl Store {
let hsmap = self.entries.write(); let hsmap = self.entries.write();
if hsmap.is_err() { if hsmap.is_err() {
return Err(SE::new(SEK::LockPoisoned, None)) return Err(SE::new(SEK::LockPoisoned, None))
.map_err(|e| SEK::MoveCallError.into_error_with_cause(Box::new(e)))
} }
if hsmap.unwrap().contains_key(&new_id) { if hsmap.unwrap().contains_key(&new_id) {
return Err(SE::new(SEK::EntryAlreadyExists, None)) return Err(SE::new(SEK::EntryAlreadyExists, None))
.map_err(|e| SEK::MoveCallError.into_error_with_cause(Box::new(e)))
} }
let old_id = entry.get_location().clone(); let old_id = entry.get_location().clone();
@ -646,7 +648,9 @@ impl Store {
} }
}) })
.map_err(|e| SE::new(SEK::FileError, Some(Box::new(e)))) .map_err(|e| SE::new(SEK::FileError, Some(Box::new(e))))
.and_then(|_| self.execute_hooks_for_id(self.post_move_aspects.clone(), &new_id)) .and_then(|_| self.execute_hooks_for_id(self.post_move_aspects.clone(), &new_id)
.map_err(|e| SE::new(SEK::PostHookExecuteError, Some(Box::new(e)))))
.map_err(|e| SEK::MoveCallError.into_error_with_cause(Box::new(e)))
} }
/// Move an entry without loading /// Move an entry without loading