Package: spring-build / 2.7.0-2

new_jets3t_0_8.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
--- a/org.springframework.build.aws.ant/src/main/java/org/springframework/build/aws/ant/AbstractS3DownloadOperation.java
+++ b/org.springframework.build.aws.ant/src/main/java/org/springframework/build/aws/ant/AbstractS3DownloadOperation.java
@@ -24,6 +24,7 @@
 
 import org.apache.tools.ant.Project;
 import org.jets3t.service.S3Service;
+import org.jets3t.service.ServiceException;
 import org.jets3t.service.S3ServiceException;
 import org.jets3t.service.model.S3Bucket;
 import org.jets3t.service.model.S3Object;
@@ -55,6 +56,9 @@
 			long endTime = System.currentTimeMillis();
 			logEnd(source, startTime, endTime);
 		}
+		catch (ServiceException e) {
+			throw new S3ServiceException(e);
+		}
 		finally {
 			if (in != null) {
 				try {
@@ -87,4 +91,4 @@
 				+ TransferUtils.getFormattedSpeed(source.getContentLength(), transferTime), Project.MSG_INFO);
 	}
 
-}
\ No newline at end of file
+}
--- a/org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resource.java
+++ b/org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resource.java
@@ -21,6 +21,7 @@
 
 import org.apache.ivy.plugins.repository.Resource;
 import org.jets3t.service.S3Service;
+import org.jets3t.service.ServiceException;
 import org.jets3t.service.S3ServiceException;
 import org.jets3t.service.model.S3Bucket;
 import org.jets3t.service.model.S3Object;
@@ -83,6 +84,9 @@
 		catch (S3ServiceException e) {
 			throw new S3RepositoryException(e);
 		}
+		catch (ServiceException e) {
+			throw new S3RepositoryException(e);
+		}
 	}
 
 	private void initializeS3(String uri) {