From fc79bb51f4a8ea00a75fdcbd1d1ef8c5e2d29d63 Mon Sep 17 00:00:00 2001
From: Una Thompson <me@unascribed.com>
Date: Sun, 23 Jul 2023 00:34:12 -0700
Subject: [PATCH] Fix blunder, Gradle 8 deprecation nonsense, compile for 11

---
 build.gradle                                         | 12 +++++++++---
 .../java/com/jortage/poolmgr/JortageBlobStore.java   |  5 +++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2cc97df..5c0fbeb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,8 +8,14 @@ repositories {
 	mavenCentral()
 }
 
-archivesBaseName = 'jortage-poolmgr'
-version = '1.4.0'
+base {
+	archivesName = 'jortage-poolmgr'
+	version = '1.4.1'
+}
+
+compileJava {
+	options.release = 11
+}
 
 sourceSets {
 	main {
@@ -76,4 +82,4 @@ tasks.named("dependencyUpdates").configure {
 		it.candidate.version.contains("alpha") || it.candidate.version.contains("beta")
 			|| (it.candidate.group == 'org.slf4j' && it.candidate.version.startsWith("2."))
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/jortage/poolmgr/JortageBlobStore.java b/src/main/java/com/jortage/poolmgr/JortageBlobStore.java
index c6928a1..57b2cbe 100644
--- a/src/main/java/com/jortage/poolmgr/JortageBlobStore.java
+++ b/src/main/java/com/jortage/poolmgr/JortageBlobStore.java
@@ -324,7 +324,8 @@ public class JortageBlobStore extends ForwardingBlobStore {
 				// (causes intermittent 429s on at least DigitalOcean)
 				Thread.sleep(100);
 				BlobMetadata meta = delegate().blobMetadata(mpu.containerName(), mpu.blobName());
-				if (meta == null) {
+				BlobMetadata targetMeta = delegate().blobMetadata(bucket, path);
+				if (targetMeta == null) {
 					Thread.sleep(100);
 					etag = delegate().copyBlob(mpu.containerName(), mpu.blobName(), bucket, path, CopyOptions.builder().contentMetadata(meta.getContentMetadata()).build());
 					Thread.sleep(100);
@@ -332,7 +333,7 @@ public class JortageBlobStore extends ForwardingBlobStore {
 					Queries.putPendingBackup(dataSource, hash);
 				} else {
 					Thread.sleep(100);
-					etag = delegate().blobMetadata(bucket, path).getETag();
+					etag = targetMeta.getETag();
 				}
 				Queries.putMap(dataSource, identity, Preconditions.checkNotNull(meta.getUserMetadata().get("jortage-originalname")), hash);
 				Queries.putFilesize(dataSource, hash, counter.getCount());