You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/03/20 07:18:13 UTC
[camel] branch master updated (a26ac21 -> 97acbb5)
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 a26ac21 CAMEL-12104: Reduce unit test time
new bf4cecb CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS S3
new ce9e01b CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS CW
new 9463a99 CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS DDB
new 7c43601 CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS DDB Stream
new 00c4315 CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS EC2
new be5d7b0 CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS Kinesis Firehose
new b425925 CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS Kinesis
new 6086f5b CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS KMS
new 6d5c754 CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS Lambda
new 83c257d CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS MQ
new e30141d CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS SES
new 237bbcd CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS SNS
new 86f077e CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS SQS
new 97acbb5 CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS SW
The 14 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/aws/cw/CwEndpoint.java | 6 ++++--
.../main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java | 6 ++++--
.../apache/camel/component/aws/ddbstream/DdbStreamEndpoint.java | 6 ++++--
.../main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java | 6 ++++--
.../camel/component/aws/firehose/KinesisFirehoseEndpoint.java | 6 ++++--
.../org/apache/camel/component/aws/kinesis/KinesisEndpoint.java | 6 ++++--
.../main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java | 6 ++++--
.../org/apache/camel/component/aws/lambda/LambdaEndpoint.java | 6 ++++--
.../main/java/org/apache/camel/component/aws/mq/MQEndpoint.java | 6 ++++--
.../main/java/org/apache/camel/component/aws/s3/S3Endpoint.java | 7 +++++--
.../main/java/org/apache/camel/component/aws/ses/SesEndpoint.java | 6 ++++--
.../main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java | 6 ++++--
.../main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java | 7 ++++---
.../main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java | 8 +++++---
14 files changed, 58 insertions(+), 30 deletions(-)
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 03/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS DDB
Posted by ac...@apache.org.
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 9463a99e4ec60359afcc97948468c96dac8d1ff4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 08:01:52 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS DDB
---
.../main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
index fa8f45e..0daea42 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
@@ -114,8 +114,10 @@ public class DdbEndpoint extends ScheduledPollEndpoint {
@Override
public void doStop() throws Exception {
- if (ddbClient != null) {
- ddbClient.shutdown();
+ if (ObjectHelper.isEmpty(configuration.getAmazonDDBClient())) {
+ if (ddbClient != null) {
+ ddbClient.shutdown();
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 05/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS EC2
Posted by ac...@apache.org.
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 00c431573775cf5922b9566067c39799d91557b2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 08:03:31 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS EC2
---
.../main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
index 0b440c5..77c4ea3 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
@@ -72,8 +72,10 @@ public class EC2Endpoint extends ScheduledPollEndpoint {
@Override
public void doStop() throws Exception {
- if (ec2Client != null) {
- ec2Client.shutdown();
+ if (ObjectHelper.isEmpty(configuration.getAmazonEc2Client())) {
+ if (ec2Client != null) {
+ ec2Client.shutdown();
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 04/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS DDB Stream
Posted by ac...@apache.org.
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 7c436016eb9fbd94fe6fa31e6d8c9671a43530d3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 08:02:38 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS DDB Stream
---
.../org/apache/camel/component/aws/ddbstream/DdbStreamEndpoint.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpoint.java
index 662c8ec..11e12fa 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpoint.java
@@ -82,8 +82,10 @@ public class DdbStreamEndpoint extends ScheduledPollEndpoint {
@Override
public void doStop() throws Exception {
- if (ddbStreamClient != null) {
- ddbStreamClient.shutdown();
+ if (ObjectHelper.isEmpty(configuration.getAmazonDynamoDbStreamsClient())) {
+ if (ddbStreamClient != null) {
+ ddbStreamClient.shutdown();
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 11/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS SES
Posted by ac...@apache.org.
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 e30141d7ec201d5eea09666c4b9cafd717127ac0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 08:09:29 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS SES
---
.../main/java/org/apache/camel/component/aws/ses/SesEndpoint.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
index d071d7e..b12cba7 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
@@ -66,8 +66,10 @@ public class SesEndpoint extends DefaultEndpoint {
@Override
public void doStop() throws Exception {
- if (sesClient != null) {
- sesClient.shutdown();
+ if (ObjectHelper.isEmpty(configuration.getAmazonSESClient())) {
+ if (sesClient != null) {
+ sesClient.shutdown();
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 14/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS SW
Posted by ac...@apache.org.
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 97acbb5ecd8680ac02181912756f2a01175c194a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 08:11:58 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS SW
---
.../main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
index 238adfe..8be1908 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
@@ -84,9 +84,11 @@ public class SWFEndpoint extends DefaultEndpoint {
@Override
protected void doStop() throws Exception {
- if (amazonSWClient != null) {
- amazonSWClient.shutdown();
- amazonSWClient = null;
+ if (ObjectHelper.isEmpty(configuration.getAmazonSWClient())) {
+ if (amazonSWClient != null) {
+ amazonSWClient.shutdown();
+ amazonSWClient = null;
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 01/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS S3
Posted by ac...@apache.org.
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 bf4cecb249a25bb21c98022e1ad78397e24d77f1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 07:53:12 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS S3
---
.../main/java/org/apache/camel/component/aws/s3/S3Endpoint.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
index 76ce195..d6a2ffe 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
@@ -38,6 +38,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.support.SynchronizationAdapter;
import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -140,8 +141,10 @@ public class S3Endpoint extends ScheduledPollEndpoint {
@Override
public void doStop() throws Exception {
- if (s3Client != null) {
- s3Client.shutdown();
+ if (ObjectHelper.isEmpty(configuration.getAmazonS3Client())) {
+ if (s3Client != null) {
+ s3Client.shutdown();
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 08/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS KMS
Posted by ac...@apache.org.
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 6086f5bdd260bf6bba477ec947b7f9da39775ff3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 08:06:29 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS KMS
---
.../main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java
index 2d6a61f..4a5f15d 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java
@@ -70,8 +70,10 @@ public class KMSEndpoint extends ScheduledPollEndpoint {
@Override
public void doStop() throws Exception {
- if (kmsClient != null) {
- kmsClient.shutdown();
+ if (ObjectHelper.isEmpty(configuration.getKmsClient())) {
+ if (kmsClient != null) {
+ kmsClient.shutdown();
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 09/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS Lambda
Posted by ac...@apache.org.
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 6d5c7543477a4501c2de7b579eee948dfb9f2d8a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 08:07:12 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS Lambda
---
.../java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java
index 5d57793..b83ffd9 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java
@@ -69,8 +69,10 @@ public class LambdaEndpoint extends DefaultEndpoint {
@Override
public void doStop() throws Exception {
- if (awsLambdaClient != null) {
- awsLambdaClient.shutdown();
+ if (ObjectHelper.isEmpty(configuration.getAwsLambdaClient())) {
+ if (awsLambdaClient != null) {
+ awsLambdaClient.shutdown();
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 13/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS SQS
Posted by ac...@apache.org.
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 86f077eba053bebbdba38e8ca558248dd0f84a43
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 08:11:03 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS SQS
---
.../main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
index fda087e..1ab049b 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
@@ -24,7 +24,6 @@ import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.sqs.AmazonSQS;
import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
@@ -221,8 +220,10 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt
@Override
public void doStop() throws Exception {
- if (client != null) {
- client.shutdown();
+ if (ObjectHelper.isEmpty(configuration.getAmazonSQSClient())) {
+ if (client != null) {
+ client.shutdown();
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 06/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS Kinesis Firehose
Posted by ac...@apache.org.
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 be5d7b0b9b1b414800950250fe929cf5f6298bf1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 08:04:20 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS Kinesis Firehose
---
.../camel/component/aws/firehose/KinesisFirehoseEndpoint.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java
index 7bed819..3dbca8e 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java
@@ -69,8 +69,10 @@ public class KinesisFirehoseEndpoint extends DefaultEndpoint {
@Override
public void doStop() throws Exception {
- if (kinesisFirehoseClient != null) {
- kinesisFirehoseClient.shutdown();
+ if (ObjectHelper.isEmpty(configuration.getAmazonKinesisFirehoseClient())) {
+ if (kinesisFirehoseClient != null) {
+ kinesisFirehoseClient.shutdown();
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 02/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS CW
Posted by ac...@apache.org.
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 ce9e01b137155da0226c7d5682a9f1742807b285
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 07:56:25 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS CW
---
.../src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
index fa016ff..0a3400a 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
@@ -77,8 +77,10 @@ public class CwEndpoint extends DefaultEndpoint {
@Override
public void doStop() throws Exception {
- if (cloudWatchClient != null) {
- cloudWatchClient.shutdown();
+ if (ObjectHelper.isEmpty(configuration.getAmazonCwClient())) {
+ if (cloudWatchClient != null) {
+ cloudWatchClient.shutdown();
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 07/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS Kinesis
Posted by ac...@apache.org.
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 b4259255143059e5e83e92fa9c0a9b4fa87aec82
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 08:05:44 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS Kinesis
---
.../org/apache/camel/component/aws/kinesis/KinesisEndpoint.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
index 6e12682..9ec98e2 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
@@ -67,8 +67,10 @@ public class KinesisEndpoint extends ScheduledPollEndpoint {
@Override
public void doStop() throws Exception {
- if (kinesisClient != null) {
- kinesisClient.shutdown();
+ if (ObjectHelper.isEmpty(configuration.getAmazonKinesisClient())) {
+ if (kinesisClient != null) {
+ kinesisClient.shutdown();
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 10/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS MQ
Posted by ac...@apache.org.
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 83c257d7ddf1f3c279bbbf5bc4ff3ad48f3b2f75
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 08:07:57 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS MQ
---
.../src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
index cb44848..3322231 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
@@ -71,8 +71,10 @@ public class MQEndpoint extends ScheduledPollEndpoint {
@Override
public void doStop() throws Exception {
- if (mqClient != null) {
- mqClient.shutdown();
+ if (ObjectHelper.isEmpty(configuration.getAmazonMqClient())) {
+ if (mqClient != null) {
+ mqClient.shutdown();
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 12/14: CAMEL-12379 - Shutdown only AWS clients owned by the
context - AWS SNS
Posted by ac...@apache.org.
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 237bbcd4e37e96a0104b987fb7f75ab1142a6063
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 20 08:10:10 2018 +0100
CAMEL-12379 - Shutdown only AWS clients owned by the context - AWS SNS
---
.../main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
index 0576914..ad89d46 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
@@ -155,8 +155,10 @@ public class SnsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
@Override
public void doStop() throws Exception {
- if (snsClient != null) {
- snsClient.shutdown();
+ if (ObjectHelper.isEmpty(configuration.getAmazonSNSClient())) {
+ if (snsClient != null) {
+ snsClient.shutdown();
+ }
}
super.doStop();
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.