[camel] branch master updated (950b328 -> 58ca94d)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (950b328 -> 58ca94d)

acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 950b328  Upgrade AWS SDK v2 to version 2.11.2
     new 4efa751  Camel-AWS2-S3: Removed unused list, thanks Pascal Schumacher for spotting
     new 58ca94d  Camel-Core-Engine: Fixed CS

The 2 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.


Summary of changes:
 .../main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java   | 2 --
 .../src/main/java/org/apache/camel/builder/ExpressionClause.java       | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[camel] 01/02: Camel-AWS2-S3: Removed unused list, thanks Pascal Schumacher for spotting

acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 4efa7515ab07d866e061c49bb154b46be358a67e
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Thu Mar 26 09:07:07 2020 +0100

    Camel-AWS2-S3: Removed unused list, thanks Pascal Schumacher for spotting
---
 .../main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
index de0e7d2..acd8047 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
@@ -170,7 +170,6 @@ public class AWS2S3Producer extends DefaultProducer {
 
         CreateMultipartUploadResponse initResponse = getEndpoint().getS3Client().createMultipartUpload(createMultipartUploadRequest.build());
         final long contentLength = Long.valueOf(objectMetadata.get("Content-Length"));
-        final List<String> partETags = new ArrayList<>();
         List<CompletedPart> completedParts = new ArrayList<CompletedPart>();
         long partSize = getConfiguration().getPartSize();
         CompleteMultipartUploadResponse uploadResult = null;
@@ -186,7 +185,6 @@ public class AWS2S3Producer extends DefaultProducer {
 
                 LOG.trace("Uploading part [{}] for {}", part, keyName);
                 String etag = getEndpoint().getS3Client().uploadPart(uploadRequest, RequestBody.fromFile(filePayload)).eTag();
-                partETags.add(etag);
                 CompletedPart partUpload = CompletedPart.builder().partNumber(part).eTag(etag).build();
                 completedParts.add(partUpload);
                 filePosition += partSize;

Reply | Threaded
Open this post in threaded view
|

[camel] 02/02: Camel-Core-Engine: Fixed CS

acosentino
In reply to this post by acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 58ca94d446c3804811c2b567bd472a8521c40a5c
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Thu Mar 26 09:11:32 2020 +0100

    Camel-Core-Engine: Fixed CS
---
 .../src/main/java/org/apache/camel/builder/ExpressionClause.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionClause.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 9dd2f6f..caeb6f9 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -36,6 +36,7 @@ import org.apache.camel.support.builder.Namespaces;
  */
 public class ExpressionClause<T> implements Expression, Predicate {
     private ExpressionClauseSupport<T> delegate;
+    private volatile Expression expr;
 
     public ExpressionClause(T result) {
         this.delegate = new ExpressionClauseSupport<>(result);
@@ -940,8 +941,6 @@ public class ExpressionClause<T> implements Expression, Predicate {
         return delegate.getExpressionType();
     }
 
-    private volatile Expression expr;
-
     @Override
     public void init(CamelContext context) {
         if (expr == null) {