[mvel] 18/42: Fixed a compilation error with Java 8

[Emmanuel Bourg]

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

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

commit bcb2cf41634f90eb68bc2eabb9d282ccf4c0ddcd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 13 22:46:14 2014 +0000

    Fixed a compilation error with Java 8
---
 debian/changelog                         |  7 +++++++
 debian/patches/java8-compatibility.patch | 18 ++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6b33034..81c52e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mvel (2.0.18-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed a compilation error with Java 8
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 14 May 2014 00:45:07 +0200
+
 mvel (2.0.18-3) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch
new file mode 100644
index 0000000..5c05680
--- /dev/null
+++ b/debian/patches/java8-compatibility.patch
@@ -0,0 +1,18 @@
+Description: Fixes a compilation failure with Java 8
+Author: Emmanuel Bourg
+Forwarded: no
+--- a/src/main/java/org/mvel2/util/JITClassLoader.java
++++ b/src/main/java/org/mvel2/util/JITClassLoader.java
+@@ -45,11 +45,6 @@
+     }
+ 
+     public Class<?> defineClassX(String className, byte[] b, int off, int len) {
+-        if (sunJVM) {
+-            return ((Unsafe) sunUnsafe).defineClass(className, b, off, len);
+-        }
+-        else {
+-            return super.defineClass(className, b, off, len);
+-        }
++        return super.defineClass(className, b, off, len);
+     }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index eec4d9e..171a7cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 pom.diff
 use_system_asm.diff
+java8-compatibility.patch

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