[pkg-java] r18143 - in trunk/mvel/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-05-13 22:46:14 +0000 (Tue, 13 May 2014)
New Revision: 18143

Added:
   trunk/mvel/debian/patches/java8-compatibility.patch
Modified:
   trunk/mvel/debian/changelog
   trunk/mvel/debian/patches/series
Log:
Fixed a compilation error with Java 8



Modified: trunk/mvel/debian/changelog
===================================================================
--- trunk/mvel/debian/changelog	2014-05-13 16:56:03 UTC (rev 18142)
+++ trunk/mvel/debian/changelog	2014-05-13 22:46:14 UTC (rev 18143)
@@ -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.

Added: trunk/mvel/debian/patches/java8-compatibility.patch
===================================================================
--- trunk/mvel/debian/patches/java8-compatibility.patch	                        (rev 0)
+++ trunk/mvel/debian/patches/java8-compatibility.patch	2014-05-13 22:46:14 UTC (rev 18143)
@@ -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);
+     }
+ }

Modified: trunk/mvel/debian/patches/series
===================================================================
--- trunk/mvel/debian/patches/series	2014-05-13 16:56:03 UTC (rev 18142)
+++ trunk/mvel/debian/patches/series	2014-05-13 22:46:14 UTC (rev 18143)
@@ -1,2 +1,3 @@
 pom.diff
 use_system_asm.diff
+java8-compatibility.patch