Applied patch for CONNECTORS-1775 about AmazonS3 connector and exclude buckets feature
diff --git a/CHANGES.txt b/CHANGES.txt
index be28ff5..ba9eb88 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,8 @@
======================= 2.29-dev =========================
+CONNECTORS-1775: The 'exclude buckets' option in the Amazon S3 repository connector does not work
+(Mingchun Zhao)
======================= Release 2.28 =========================
diff --git a/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java b/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java
index d611d9b..ae17996 100644
--- a/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java
+++ b/connectors/amazons3/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/amazons3/AmazonS3Connector.java
@@ -783,9 +783,10 @@
List<String> refinedBuckets = new ArrayList<String>();
for (Bucket bucket : listBuckets) {
- if (bucketsToBeRemoved != null && bucketsToBeRemoved.length > 0 && !Arrays.asList(bucketsToBeRemoved).contains(
- bucket.getName())) {
- refinedBuckets.add(bucket.getName());
+ if (bucketsToBeRemoved != null && bucketsToBeRemoved.length > 0) {
+ if (!Arrays.asList(bucketsToBeRemoved).contains(bucket.getName())) {
+ refinedBuckets.add(bucket.getName());
+ }
}
else{
refinedBuckets.add(bucket.getName());
