This is an automated email from the ASF dual-hosted git repository.
mattyb149 pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 1f3b49b02b NIFI-13666 Applied the change to 1.X
1f3b49b02b is described below
commit 1f3b49b02bce3fb1e908716cb6398387dd425728
Author: Mike Thomsen <[email protected]>
AuthorDate: Wed Aug 21 08:16:04 2024 -0400
NIFI-13666 Applied the change to 1.X
Signed-off-by: Matt Burgess <[email protected]>
This closes #9190
---
.../src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java | 2 +-
.../src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java | 2 +-
.../src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java | 2 +-
.../java/org/apache/nifi/processors/aws/s3/GetS3ObjectMetadata.java | 2 +-
.../src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java | 2 +-
.../src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java
index 7aa4c03623..1a66e5194f 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java
@@ -134,7 +134,7 @@ public class CopyS3Object extends AbstractS3Processor {
s3.copyObject(request);
session.getProvenanceReporter().send(flowFile,
getTransitUrl(destinationBucket, destinationKey));
session.transfer(flowFile, REL_SUCCESS);
- } catch (final AmazonClientException e) {
+ } catch (final IllegalArgumentException | AmazonClientException e) {
flowFile = extractExceptionDetails(e, session, flowFile);
getLogger().error("Failed to copy S3 object from Bucket [{}] Key
[{}]", sourceBucket, sourceKey, e);
session.transfer(flowFile, REL_FAILURE);
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
index 948da8e43f..4a8443b657 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
@@ -128,7 +128,7 @@ public class DeleteS3Object extends AbstractS3Processor {
final DeleteVersionRequest r = new
DeleteVersionRequest(bucket, key, versionId);
s3.deleteVersion(r);
}
- } catch (final AmazonServiceException ase) {
+ } catch (final IllegalArgumentException | AmazonServiceException ase) {
flowFile = extractExceptionDetails(ase, session, flowFile);
getLogger().error("Failed to delete S3 Object for {}; routing to
failure", flowFile, ase);
flowFile = session.penalize(flowFile);
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
index e9b66f476c..e064743d8b 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
@@ -286,7 +286,7 @@ public class FetchS3Object extends AbstractS3Processor {
if (metadata.getVersionId() != null) {
attributes.put("s3.version", metadata.getVersionId());
}
- } catch (final IOException | AmazonClientException ioe) {
+ } catch (final IllegalArgumentException | IOException |
AmazonClientException ioe) {
flowFile = extractExceptionDetails(ioe, session, flowFile);
getLogger().error("Failed to retrieve S3 Object for {}; routing to
failure", flowFile, ioe);
flowFile = session.penalize(flowFile);
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/GetS3ObjectMetadata.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/GetS3ObjectMetadata.java
index b6db73a9e6..b3838631f0 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/GetS3ObjectMetadata.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/GetS3ObjectMetadata.java
@@ -207,7 +207,7 @@ public class GetS3ObjectMetadata extends
AbstractS3Processor {
}
session.transfer(flowFile, relationship);
- } catch (final AmazonClientException e) {
+ } catch (final IllegalArgumentException | AmazonClientException e) {
getLogger().error("Failed to get S3 Object Metadata from Bucket
[{}] Key [{}]", bucket, key, e);
flowFile = extractExceptionDetails(e, session, flowFile);
session.transfer(flowFile, REL_FAILURE);
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java
index 54a543ed43..fa60839527 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java
@@ -868,7 +868,7 @@ public class PutS3Object extends AbstractS3Processor {
} catch (IOException e) {
getLogger().info("Error trying to delete key {} from cache",
cacheKey, e);
}
- } catch (final ProcessException | AmazonClientException pe) {
+ } catch (final IllegalArgumentException | ProcessException |
AmazonClientException pe) {
extractExceptionDetails(pe, session, flowFile);
if (pe.getMessage().contains(S3_PROCESS_UNSCHEDULED_MESSAGE)) {
getLogger().info(pe.getMessage());
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java
index 2b10b8a8fd..f28c862f58 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java
@@ -203,7 +203,7 @@ public class TagS3Object extends AbstractS3Processor {
r = new SetObjectTaggingRequest(bucket, key, version, new
ObjectTagging(tags));
}
s3.setObjectTagging(r);
- } catch (final AmazonServiceException ase) {
+ } catch (final IllegalArgumentException | AmazonServiceException ase) {
flowFile = extractExceptionDetails(ase, session, flowFile);
getLogger().error("Failed to tag S3 Object for {}; routing to
failure", flowFile, ase);
flowFile = session.penalize(flowFile);
