You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by sh...@apache.org on 2015/04/03 21:06:46 UTC
svn commit: r1671129 -
/jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java
Author: shashank
Date: Fri Apr 3 19:06:46 2015
New Revision: 1671129
URL: http://svn.apache.org/r1671129
Log:
JCR-3867 [jackrabbit-aws-ext] Handle 403(forbidden) status in checking existence of object in S3
Added handling of 403 status.
Modified:
jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java
Modified: jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java?rev=1671129&r1=1671128&r2=1671129&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java (original)
+++ jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java Fri Apr 3 19:06:46 2015
@@ -236,7 +236,7 @@ public class S3Backend implements Backen
}
return false;
} catch (AmazonServiceException e) {
- if (e.getStatusCode() == 404) {
+ if (e.getStatusCode() == 404 || e.getStatusCode() == 403) {
LOG.debug("exists [{}]: [false] took [{}] ms.",
identifier, (System.currentTimeMillis() - start) );
return false;
@@ -279,7 +279,7 @@ public class S3Backend implements Backen
}
} catch (AmazonServiceException e) {
- if (e.getStatusCode() == 404) {
+ if (e.getStatusCode() == 404 || e.getStatusCode() == 403) {
retVal = false;
} else {
throw new DataStoreException(
@@ -443,7 +443,7 @@ public class S3Backend implements Backen
(System.currentTimeMillis() - start) });
return lastModified;
} catch (AmazonServiceException e) {
- if (e.getStatusCode() == 404) {
+ if (e.getStatusCode() == 404 || e.getStatusCode() == 403) {
LOG.info(
"getLastModified:Identifier [{}] not found. Took [{}] ms.",
identifier, (System.currentTimeMillis() - start));
@@ -613,7 +613,7 @@ public class S3Backend implements Backen
try {
objectMetaData = s3service.getObjectMetadata(bucket, key);
} catch (AmazonServiceException ase) {
- if (ase.getStatusCode() != 404) {
+ if (!(ase.getStatusCode() == 404 || ase.getStatusCode() == 403)) {
throw ase;
}
}