You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by am...@apache.org on 2016/01/29 11:29:17 UTC
svn commit: r1727515 -
/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java
Author: amitj
Date: Fri Jan 29 10:29:17 2016
New Revision: 1727515
URL: http://svn.apache.org/viewvc?rev=1727515&view=rev
Log:
OAK-3954: [oak-blob-cloud] Update oak-blob-cloud with jackrabbit-aws-ext updates
Ported relevant update for issue JCR-3867 (1671129)
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java
Modified: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java?rev=1727515&r1=1727514&r2=1727515&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java Fri Jan 29 10:29:17 2016
@@ -234,7 +234,7 @@ public class S3Backend implements Shared
}
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;
@@ -277,7 +277,7 @@ public class S3Backend implements Shared
}
} catch (AmazonServiceException e) {
- if (e.getStatusCode() == 404) {
+ if (e.getStatusCode() == 404 || e.getStatusCode() == 403) {
retVal = false;
} else {
throw new DataStoreException(
@@ -441,7 +441,7 @@ public class S3Backend implements Shared
(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));
@@ -758,7 +758,7 @@ public class S3Backend implements Shared
try {
objectMetaData = s3service.getObjectMetadata(bucket, key);
} catch (AmazonServiceException ase) {
- if (ase.getStatusCode() != 404) {
+ if (!(ase.getStatusCode() == 404 || ase.getStatusCode() == 403)) {
throw ase;
}
}