From 537779b1529cb761904be9e8cb3c6dd63d7ef14d Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sun, 2 Jul 2023 17:49:49 +0100
Subject: [PATCH] Use a separate repository instance when updating caches.

---
 .../arbitrary/ArbitraryDataCacheManager.java       |  8 ++++----
 .../qortal/transaction/ArbitraryTransaction.java   | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCacheManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCacheManager.java
index 75b00452..f49fbad2 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCacheManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCacheManager.java
@@ -82,8 +82,8 @@ public class ArbitraryDataCacheManager extends Thread {
                 // Update arbitrary resource caches
                 try {
                     ArbitraryTransaction arbitraryTransaction = new ArbitraryTransaction(repository, transactionData);
-                    arbitraryTransaction.updateArbitraryResourceCache();
-                    arbitraryTransaction.updateArbitraryMetadataCache();
+                    arbitraryTransaction.updateArbitraryResourceCache(repository);
+                    arbitraryTransaction.updateArbitraryMetadataCache(repository);
                     repository.saveChanges();
 
                     LOGGER.debug(() -> String.format("Finished processing transaction %.8s in arbitrary resource queue...", Base58.encode(transactionData.getSignature())));
@@ -166,8 +166,8 @@ public class ArbitraryDataCacheManager extends Thread {
 
                     // Update arbitrary resource caches
                     ArbitraryTransaction arbitraryTransaction = new ArbitraryTransaction(repository, transactionData);
-                    arbitraryTransaction.updateArbitraryResourceCache();
-                    arbitraryTransaction.updateArbitraryMetadataCache();
+                    arbitraryTransaction.updateArbitraryResourceCache(repository);
+                    arbitraryTransaction.updateArbitraryMetadataCache(repository);
                 }
                 offset += batchSize;
             }
diff --git a/src/main/java/org/qortal/transaction/ArbitraryTransaction.java b/src/main/java/org/qortal/transaction/ArbitraryTransaction.java
index c0d441e0..851bd7ef 100644
--- a/src/main/java/org/qortal/transaction/ArbitraryTransaction.java
+++ b/src/main/java/org/qortal/transaction/ArbitraryTransaction.java
@@ -28,6 +28,7 @@ import org.qortal.payment.Payment;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.arbitrary.ArbitraryDataFile;
+import org.qortal.repository.RepositoryManager;
 import org.qortal.transform.TransformationException;
 import org.qortal.transform.Transformer;
 import org.qortal.transform.transaction.ArbitraryTransactionTransformer;
@@ -277,7 +278,8 @@ public class ArbitraryTransaction extends Transaction {
 	}
 
 	private void updateCaches() {
-		try {
+		// Very important to use a separate repository instance from the one being used for validation/processing
+		try (final Repository repository = RepositoryManager.getRepository()) {
 			// If the data is local, we need to perform a few actions
 			if (isDataLocal()) {
 
@@ -288,8 +290,10 @@ public class ArbitraryTransaction extends Transaction {
 			}
 
 			// Add/update arbitrary resource caches
-			this.updateArbitraryResourceCache();
-			this.updateArbitraryMetadataCache();
+			this.updateArbitraryResourceCache(repository);
+			this.updateArbitraryMetadataCache(repository);
+
+			repository.saveChanges();
 
 		} catch (Exception e) {
 			// Log and ignore all exceptions. The cache is updated from other places too, and can be rebuilt if needed.
@@ -343,7 +347,7 @@ public class ArbitraryTransaction extends Transaction {
 	 *
 	 * @throws DataException
 	 */
-	public void updateArbitraryResourceCache() throws DataException {
+	public void updateArbitraryResourceCache(Repository repository) throws DataException {
 		// Don't cache resources without a name (such as auto updates)
 		if (arbitraryTransactionData.getName() == null) {
 			return;
@@ -412,7 +416,7 @@ public class ArbitraryTransaction extends Transaction {
 		repository.getArbitraryRepository().setStatus(arbitraryResourceData, status);
 	}
 
-	public void updateArbitraryMetadataCache() throws DataException {
+	public void updateArbitraryMetadataCache(Repository repository) throws DataException {
 		// Get the latest transaction
 		ArbitraryTransactionData latestTransactionData = repository.getArbitraryRepository().getLatestTransaction(arbitraryTransactionData.getName(), arbitraryTransactionData.getService(), null, arbitraryTransactionData.getIdentifier());
 		if (latestTransactionData == null) {