diff options
Diffstat (limited to 'dev-java/jgroups/files')
| -rw-r--r-- | dev-java/jgroups/files/2.4.1-jdk4.patch | 11 | ||||
| -rw-r--r-- | dev-java/jgroups/files/2.9.0-ant-1.8-compat.patch | 20 |
2 files changed, 20 insertions, 11 deletions
diff --git a/dev-java/jgroups/files/2.4.1-jdk4.patch b/dev-java/jgroups/files/2.4.1-jdk4.patch deleted file mode 100644 index 172a4aba1296..000000000000 --- a/dev-java/jgroups/files/2.4.1-jdk4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- RequestCorrelator.java 2007/03/08 10:19:56 1.30.2.4 -+++ src/org/jgroups/blocks/RequestCorrelator.java 2007/04/23 10:15:57 1.30.2.5 -@@ -926,7 +926,7 @@ - call_stack.set(new_stack); - } - public void resetThreadLocal() { -- call_stack.remove(); -+ call_stack.set(null); - } - }); - } diff --git a/dev-java/jgroups/files/2.9.0-ant-1.8-compat.patch b/dev-java/jgroups/files/2.9.0-ant-1.8-compat.patch new file mode 100644 index 000000000000..46a7820377ec --- /dev/null +++ b/dev-java/jgroups/files/2.9.0-ant-1.8-compat.patch @@ -0,0 +1,20 @@ +--- build.xml.orig 2010-02-28 02:14:36.000000000 +0100 ++++ build.xml 2010-02-28 02:15:13.000000000 +0100 +@@ -43,8 +43,6 @@ + <property name="threadcount" value="false"/> + <property name="test.verbose" value="0"/> + +- <taskdef resource="testngtasks" classpathref="jg.classpath"/> +- + <!-- properties to determine IP version used --> + <condition property="java.net.preferIPv4Stack" value="true" else="false"> + <isfalse value="${jgroups.useIPv6}"/> +@@ -63,6 +61,8 @@ + </fileset> + </path> + ++ <taskdef resource="testngtasks" classpathref="jg.classpath"/> ++ + <!-- patternsets used to define test sets --> + <patternset id="flush.tests"> + <include name="org/jgroups/tests/FlushTest*"/> |