crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Fixed bug that prevented a resource from being overwritten if the existing data threw an exception when loading it.

Browse Source
This commit is contained in:
CalDescent 2021-12-18 17:48:58 +00:00
parent 0afb1a2d04
commit e9ab54f657
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/qortal/arbitrary/ArbitraryDataTransactionBuilder.java
View File

@ -97,7 +97,13 @@ public class ArbitraryDataTransactionBuilder {
ArbitraryDataReader reader = new ArbitraryDataReader(this.name, ResourceIdType.NAME, this.service, this.identifier); ArbitraryDataReader reader = new ArbitraryDataReader(this.name, ResourceIdType.NAME, this.service, this.identifier);
try { try {
reader.loadSynchronously(true); reader.loadSynchronously(true);
} catch (Exception e) {
// Catch all exceptions if the existing resource cannot be loaded first time
// In these cases it's simplest to just use a PUT transaction
return Method.PUT;
}
try {
// Check layer count // Check layer count
int layerCount = reader.getLayerCount(); int layerCount = reader.getLayerCount();
if (layerCount >= MAX_LAYERS) { if (layerCount >= MAX_LAYERS) {
@ -144,7 +150,7 @@ public class ArbitraryDataTransactionBuilder {
// State is appropriate for a PATCH transaction // State is appropriate for a PATCH transaction
return Method.PATCH; return Method.PATCH;
} }
catch (IOException | DataException | MissingDataException e) { catch (IOException | DataException e) {
// Handle matching states separately, as it's best to block transactions with duplicate states // Handle matching states separately, as it's best to block transactions with duplicate states
if (e.getMessage().equals("Current state matches previous state. Nothing to do.")) { if (e.getMessage().equals("Current state matches previous state. Nothing to do.")) {
throw new DataException(e.getMessage()); throw new DataException(e.getMessage());