[mina2] 02/06: Patched AprLibrary.java to fix the compatibility with tomcat-jni 8.x (Closes: #796456)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository mina2.

commit bed587812fd55999923d18ade859b1ae6a04fd83
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 12 14:42:00 2015 +0200

    Patched AprLibrary.java to fix the compatibility with tomcat-jni 8.x (Closes: #796456)
---
 debian/changelog                                 |  5 ++++-
 debian/patches/01-tomcat-jni-compatibility.patch | 15 +++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d5559c9..12b2af8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-mina2 (2.0.7+dfsg-3) UNRELEASED; urgency=medium
+mina2 (2.0.9-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+  * Patched AprLibrary.java to fix the compatibility with tomcat-jni 8.x
+    (Closes: #796456)
   * debian/orig-tar.sh:
     - No longer filter out the MD4 classes (removed upstream)
     - No longer remove the jar, vsd and javadoc files
diff --git a/debian/patches/01-tomcat-jni-compatibility.patch b/debian/patches/01-tomcat-jni-compatibility.patch
new file mode 100644
index 0000000..6225834
--- /dev/null
+++ b/debian/patches/01-tomcat-jni-compatibility.patch
@@ -0,0 +1,15 @@
+Description: Ensures the compatibility with tomcat-jni 8.x
+Author: Emmanuel Bourg <ebourg at apache.org>
+Bug: https://github.com/apache/mina/pull/5
+
+--- a/src/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java
++++ b/src/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java
+@@ -76,7 +76,7 @@
+     private AprLibrary() {
+         try {
+             Library.initialize(null);
+-        } catch (Exception e) {
++        } catch (Throwable e) {
+             throw new RuntimeException("Error loading Apache Portable Runtime (APR).", e);
+         }
+         pool = Pool.create(0);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d7dbef9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-tomcat-jni-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mina2.git