mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 01:41:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename toProtoMessageSynchronized to toPersistableMessage

Browse Source 
Make PersistableEnvelope method name less confusing, as it is only
synchronised in ThreadedPersistableEnvelope.
This commit is contained in:
Steven Barclay 2020-03-10 10:36:52 +08:00
parent 6487f92d84
commit 9e9fc6ab57
No known key found for this signature in database
GPG Key ID: 9FED6BF1176D500B
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/bisq/common/proto/persistable/PersistableEnvelope.java
View File

@ -31,7 +31,7 @@ import java.util.concurrent.FutureTask;
*/
public interface PersistableEnvelope extends Envelope {
default Message toProtoMessageSynchronized() {
default Message toPersistableMessage() {
FutureTask<Message> toProtoOnUserThread = new FutureTask<>(this::toProtoMessage);
UserThread.execute(toProtoOnUserThread);
//noinspection UnstableApiUsage

2
common/src/main/java/bisq/common/proto/persistable/ThreadedPersistableEnvelope.java
View File

@ -30,7 +30,7 @@ import com.google.protobuf.Message;
public interface ThreadedPersistableEnvelope extends PersistableEnvelope {
@Override
default Message toProtoMessageSynchronized() {
default Message toPersistableMessage() {
synchronized (this) {
return toProtoMessage();
}

2
common/src/main/java/bisq/common/storage/FileManager.java
View File

@ -189,7 +189,7 @@ public class FileManager<T extends PersistableEnvelope> {
log.debug("Write to disc: {}", storageFile.getName());
protobuf.PersistableEnvelope protoPersistable;
try {
protoPersistable = (protobuf.PersistableEnvelope) persistable.toProtoMessageSynchronized();
protoPersistable = (protobuf.PersistableEnvelope) persistable.toPersistableMessage();
if (protoPersistable.toByteArray().length == 0)
log.error("protoPersistable is empty. persistable=" + persistable.getClass().getSimpleName());
} catch (Throwable e) {