You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by da...@apache.org on 2025/01/20 02:40:15 UTC
(jackrabbit-oak) branch OAK-11217 created (now f734578a09)
This is an automated email from the ASF dual-hosted git repository.
daim pushed a change to branch OAK-11217
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at f734578a09 Merge pull request #1903 from t-rana/issues/OAK-11217
This branch includes the following new commits:
new f734578a09 Merge pull request #1903 from t-rana/issues/OAK-11217
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-oak) 01/01: Merge pull request #1903 from t-rana/issues/OAK-11217
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch OAK-11217
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit f734578a093e7678d69f10709ed4ed6d02166efb
Author: Rishabh Kumar <ri...@gmail.com>
AuthorDate: Fri Dec 13 20:03:34 2024 +0530
Merge pull request #1903 from t-rana/issues/OAK-11217
OAK-11217: set existing object meta data for s3 only
---
.../java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java
index 14803b6cbd..443be5580a 100644
--- a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java
+++ b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java
@@ -32,6 +32,7 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
import java.util.Queue;
import java.util.UUID;
@@ -343,7 +344,10 @@ public class S3Backend extends AbstractSharedBackend {
objectMetaData.getLastModified().getTime());
CopyObjectRequest copReq = new CopyObjectRequest(bucket, key,
bucket, key);
- copReq.setNewObjectMetadata(objectMetaData);
+ LOG.warn("Object MetaData before copy: {}", objectMetaData.getRawMetadata());
+ if (Objects.equals(RemoteStorageMode.S3, properties.get(S3Constants.MODE))) {
+ copReq.setNewObjectMetadata(objectMetaData);
+ }
Copy copy = tmx.copy(s3ReqDecorator.decorate(copReq));
try {
copy.waitForCopyResult();