diff options
Diffstat (limited to 'src/core/object_table.rs')
| -rw-r--r-- | src/core/object_table.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/object_table.rs b/src/core/object_table.rs index 04f64fe7..01df70e6 100644 --- a/src/core/object_table.rs +++ b/src/core/object_table.rs @@ -88,6 +88,7 @@ impl ObjectVersionState { #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)] pub enum ObjectVersionData { + Uploading, DeleteMarker, Inline(#[serde(with = "serde_bytes")] Vec<u8>), FirstBlock(Hash), @@ -125,6 +126,9 @@ impl Entry<String, String> for Object { v.size = other_v.size; } v.state = v.state.max(other_v.state); + if v.data == ObjectVersionData::Uploading { + v.data = other_v.data.clone(); + } } Err(i) => { self.versions.insert(i, other_v.clone()); |