summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/gnu-hylafax/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/gnu-hylafax/files')
-rw-r--r--dev-java/gnu-hylafax/files/gnu-hylafax-1.0.3-ClientPool.patch70
1 files changed, 70 insertions, 0 deletions
diff --git a/dev-java/gnu-hylafax/files/gnu-hylafax-1.0.3-ClientPool.patch b/dev-java/gnu-hylafax/files/gnu-hylafax-1.0.3-ClientPool.patch
new file mode 100644
index 000000000000..51bae74646ed
--- /dev/null
+++ b/dev-java/gnu-hylafax/files/gnu-hylafax-1.0.3-ClientPool.patch
@@ -0,0 +1,70 @@
+--- gnu-hylafax-pool/main/java/gnu/hylafax/pool/ClientPool.java.orig 2015-04-14 18:20:17.113435400 +0000
++++ gnu-hylafax-pool/main/java/gnu/hylafax/pool/ClientPool.java 2015-04-14 18:20:58.310438791 +0000
+@@ -32,7 +32,7 @@
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+
+-import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
++import java.util.concurrent.ConcurrentLinkedQueue;
+
+ public class ClientPool implements gnu.hylafax.ClientPool {
+
+@@ -42,7 +42,7 @@
+
+ private HashMap clientMap;
+
+- private LinkedQueue clients;
++ private ConcurrentLinkedQueue clients;
+
+ private ClientPoolConfiguration configuration;
+
+@@ -66,7 +66,7 @@
+
+ public ClientPool(ClientPoolConfiguration configuration) {
+ this.configuration = configuration;
+- clients = new LinkedQueue();
++ clients = new ConcurrentLinkedQueue();
+ clientMap = new HashMap();
+ workingClients = new HashSet();
+ workingClientsToClose = new HashSet();
+@@ -163,8 +163,7 @@
+ blocked = true;
+ }
+
+- client = (PooledClient) clients.poll(getConfiguration()
+- .getRetryInterval());
++ client = (PooledClient) clients.poll();
+ if (client == null)
+ log.warn("No Clients Available.");
+ else if (!clientAdded)
+@@ -172,10 +171,10 @@
+ }
+
+ } else {
+- client = (PooledClient) clients.take();
++ client = (PooledClient) clients.poll();
+ }
+ }
+- } catch (InterruptedException e) {
++ } catch (Exception e) {
+ throw new ClientPoolException(
+ "Interrupted Thread and No Free Connection Available.");
+ }
+@@ -294,7 +293,7 @@
+ destroyClient(client);
+ addClient();
+ } else {
+- clients.put(client);
++ clients.offer(client);
+ size++;
+ }
+ }
+@@ -306,7 +305,7 @@
+
+ log.debug("Released Client.");
+
+- } catch (InterruptedException e) {
++ } catch (Exception e) {
+ log.warn("Was Interrupted.", e);
+ destroyClient(client);
+ } finally {