File tree Expand file tree Collapse file tree 1 file changed +5
-0
lines changed
src/main/java/com/uid2/shared/cloud Expand file tree Collapse file tree 1 file changed +5
-0
lines changed Original file line number Diff line number Diff line change @@ -131,11 +131,16 @@ public InputStream download(String cloudPath) throws CloudStorageException {
131131 S3Object obj = this .s3 .getObject (bucket , cloudPath );
132132 return obj .getObjectContent ();
133133 } catch (AmazonS3Exception e ) {
134+ <<<<<<< Updated upstream
134135 if (e .getErrorCode ().equals ("NoSuchKey" )) {
135136 throw new CloudStorageException ("The specified key does not exist: " + e .getClass ().getSimpleName () + ": " + bucket );
136137 } else {
137138 throw new CloudStorageException ("s3 get error: " + e .getClass ().getSimpleName () + ": " + bucket );
138139 }
140+ =======
141+ LOGGER .error ("AWS S3 error: " + e .getMessage () + " for path: " + cloudPath + " in bucket: " + bucket + " with status code: " + e .getStatusCode () + " and error code: " + e .getErrorCode ());
142+ throw new CloudStorageException ("s3 get error: " + e .getMessage (), e );
143+ >>>>>>> Stashed changes
139144 } catch (Throwable t ) {
140145 // Do not log the message or the original exception as that may contain the pre-signed url
141146 throw new CloudStorageException ("s3 get error: " + t .getClass ().getSimpleName () + ": " + bucket );
You can’t perform that action at this time.
0 commit comments