Propagating borrowObject's Exception as a RuntimeException

mpetazzoni · Nov 23, 2016 · 0f1356d · 0f1356d
1 parent 3b6ed17
commit 0f1356d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/core/src/main/java/com/turn/ttorrent/common/ByteBufferPool.java b/core/src/main/java/com/turn/ttorrent/common/ByteBufferPool.java
@@ -36,8 +36,12 @@ public ByteBufferPool(int amount, int length) {
         pool = new GenericObjectPool<ByteBuffer>(new ByteBufferFactory(length), gopc);
     }
 
-    public ByteBuffer borrowObject() throws Exception {
-        return pool.borrowObject();
+    public ByteBuffer borrowObject() {
+        try {
+            return pool.borrowObject();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public void returnObject(ByteBuffer buffer) {

diff --git a/core/src/main/java/com/turn/ttorrent/common/Torrent.java b/core/src/main/java/com/turn/ttorrent/common/Torrent.java
@@ -505,7 +505,7 @@ public static Torrent load(File torrent, boolean seeder)
 	 * torrent's creator.
 	 */
 	public static Torrent create(File source, URI announce, String createdBy)
-		throws InterruptedException, IOException, NoSuchAlgorithmException, Exception {
+		throws InterruptedException, IOException, NoSuchAlgorithmException {
 		return Torrent.create(source, null, DEFAULT_PIECE_LENGTH, 
 				announce, null, createdBy);
 	}
@@ -528,7 +528,7 @@ public static Torrent create(File source, URI announce, String createdBy)
 	 * torrent's creator.
 	 */
 	public static Torrent create(File parent, List<File> files, URI announce,
-		String createdBy) throws InterruptedException, IOException, NoSuchAlgorithmException, Exception {
+		String createdBy) throws InterruptedException, IOException, NoSuchAlgorithmException {
 		return Torrent.create(parent, files, DEFAULT_PIECE_LENGTH, 
 				announce, null, createdBy);
 	}
@@ -549,7 +549,7 @@ public static Torrent create(File parent, List<File> files, URI announce,
 	 * torrent's creator.
 	 */
 	public static Torrent create(File source, int pieceLength, List<List<URI>> announceList,
-			String createdBy) throws InterruptedException, IOException, NoSuchAlgorithmException, Exception {
+			String createdBy) throws InterruptedException, IOException, NoSuchAlgorithmException {
 		return Torrent.create(source, null, pieceLength, 
 				null, announceList, createdBy);
 	}
@@ -574,7 +574,7 @@ public static Torrent create(File source, int pieceLength, List<List<URI>> annou
 	 */
 	public static Torrent create(File source, List<File> files, int pieceLength,
 			List<List<URI>> announceList, String createdBy)
-			throws InterruptedException, IOException, NoSuchAlgorithmException, Exception {
+			throws InterruptedException, IOException, NoSuchAlgorithmException {
 		return Torrent.create(source, files, pieceLength, 
 				null, announceList, createdBy);
 	}
@@ -600,7 +600,7 @@ public static Torrent create(File source, List<File> files, int pieceLength,
 	 */
 	private static Torrent create(File parent, List<File> files, int pieceLength,
 				URI announce, List<List<URI>> announceList, String createdBy)
-			throws InterruptedException, IOException, NoSuchAlgorithmException, Exception {
+			throws InterruptedException, IOException, NoSuchAlgorithmException {
 		if (files == null || files.isEmpty()) {
 			logger.info("Creating single-file torrent for {}...",
 				parent.getName());
@@ -715,12 +715,12 @@ public String call() throws UnsupportedEncodingException, InterruptedException {
 	 * @param file The file to hash.
 	 */
 	private static String hashFile(File file, int pieceLength)
-		throws InterruptedException, IOException, NoSuchAlgorithmException, Exception {
+		throws InterruptedException, IOException, NoSuchAlgorithmException {
 		return Torrent.hashFiles(Arrays.asList(new File[] { file }), pieceLength);
 	}
 
 	private static String hashFiles(List<File> files, int pieceLength)
-		throws InterruptedException, IOException, NoSuchAlgorithmException, Exception {
+		throws InterruptedException, IOException, NoSuchAlgorithmException {
 		int threads = getHashingThreadsCount();
 		ExecutorService executor = Executors.newFixedThreadPool(threads);
 		final ByteBufferPool bbp = new ByteBufferPool(threads + 1, pieceLength);