[libspring-java] 03/04: Fixed a build failure with JRuby 9

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Jul 24 17:57:53 UTC 2017


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

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

commit 724cda46e31237d89bd250973b1c57816e8dc737
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 24 19:53:02 2017 +0200

    Fixed a build failure with JRuby 9
---
 debian/changelog                              |  1 +
 debian/patches/0046-jruby-compatibility.patch | 16 ++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bdfe567..d1bb1cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libspring-java (4.3.10-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+  * Fixed a build failure with JRuby 9
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 24 Jul 2017 19:32:18 +0200
 
diff --git a/debian/patches/0046-jruby-compatibility.patch b/debian/patches/0046-jruby-compatibility.patch
new file mode 100644
index 0000000..9700c3f
--- /dev/null
+++ b/debian/patches/0046-jruby-compatibility.patch
@@ -0,0 +1,16 @@
+Description: Fixes the compatibility with the version of JRuby in Debian
+Author: Emmanuel Bourg <ebourg at apahe.org>
+Forwarded: no
+--- a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java
++++ b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java
+@@ -124,8 +124,8 @@
+ 				}
+ 				else {
+ 					// JRuby 1.7.x: no accessor, just a public message field
+-					if (rubyEx.message != null){
+-						msg = rubyEx.message.toString();
++					if (rubyEx.getMessage() != null){
++						msg = rubyEx.getMessage().toString();
+ 					}
+ 				}
+ 			}
diff --git a/debian/patches/series b/debian/patches/series
index 6af5b65..e03cd8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 0043-ignore-okhttp.patch
 0044-ignore-httpunit.patch
 0045-ignore-caffeine.patch
+0046-jruby-compatibility.patch

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



More information about the pkg-java-commits mailing list