Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pulled common logic into method.

Browse Source
This commit is contained in:
Florian Nücke
2021-01-08 21:08:24 +01:00
parent 2a0b1f9a11
commit 4f93417bd2
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/li/cil/oc2/common/bus/device/item/AbstractHardDriveVMDevice.java
View File

@@ -99,17 +99,7 @@ public abstract class AbstractHardDriveVMDevice<T extends BlockDevice> extends I
public CompoundNBT serializeNBT() {
final CompoundNBT tag = new CompoundNBT();
if (data != null) {
final Optional<InputStream> optional = getSerializationStream(data);
optional.ifPresent(stream -> {
blobHandle = BlobStorage.validateHandle(blobHandle);
jobHandle = BlobStorage.submitSave(blobHandle, stream);
});
if (!optional.isPresent()) {
BlobStorage.freeHandle(blobHandle);
blobHandle = null;
}
}
serializeData();
if (device != null) {
deviceNbt = NBTSerialization.serialize(device);
}
@@ -191,17 +181,7 @@ public abstract class AbstractHardDriveVMDevice<T extends BlockDevice> extends I
// actual data being unloaded at that point, but want to permanently persist
// it (it's the contents of the block device) we need to serialize it in the
// unload, too. Don't need to wait for the job, though.
if (data != null) {
final Optional<InputStream> optional = getSerializationStream(data);
optional.ifPresent(stream -> {
blobHandle = BlobStorage.validateHandle(blobHandle);
BlobStorage.submitSave(blobHandle, stream);
});
if (!optional.isPresent()) {
BlobStorage.freeHandle(blobHandle);
blobHandle = null;
}
}
serializeData();
data = null;
jobHandle = null;
@@ -211,4 +191,18 @@ public abstract class AbstractHardDriveVMDevice<T extends BlockDevice> extends I
address.clear();
interrupt.clear();
}
private void serializeData() {
if (data != null) {
final Optional<InputStream> optional = getSerializationStream(data);
optional.ifPresent(stream -> {
blobHandle = BlobStorage.validateHandle(blobHandle);
jobHandle = BlobStorage.submitSave(blobHandle, stream);
});
if (!optional.isPresent()) {
BlobStorage.freeHandle(blobHandle);
blobHandle = null;
}
}
}
}