[jabref] 01/02: patch uses of unirest that now throw JSONException
Tony Mancill
tmancill at moszumanska.debian.org
Mon Nov 28 07:01:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch dev
in repository jabref.
commit a371e0a3ee3f370081ff0c07a44ae4157798d5c9
Author: tony mancill <tmancill at debian.org>
Date: Sun Nov 27 22:47:15 2016 -0800
patch uses of unirest that now throw JSONException
---
debian/patches/series | 1 +
debian/patches/unirest_json.patch | 40 +++++++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+)
diff --git a/debian/patches/series b/debian/patches/series
index a271070..b64cd1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ gradle_build.patch
disable_automatic_upgrade_check.patch
xjc.patch
disable_macadapter.patch
+unirest_json.patch
diff --git a/debian/patches/unirest_json.patch b/debian/patches/unirest_json.patch
new file mode 100644
index 0000000..d23dfac
--- /dev/null
+++ b/debian/patches/unirest_json.patch
@@ -0,0 +1,40 @@
+--- a/src/main/java/net/sf/jabref/gui/worker/VersionWorker.java
++++ b/src/main/java/net/sf/jabref/gui/worker/VersionWorker.java
+@@ -14,6 +14,7 @@
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
++import org.json.JSONException;
+
+ public class VersionWorker extends SwingWorker<Version, Void> {
+
+@@ -35,8 +36,8 @@
+ protected Version doInBackground() throws Exception {
+ try {
+ return Version.getLatestVersion();
+- } catch (IOException ioException) {
+- LOGGER.warn("Could not connect to the updateserver.", ioException);
++ } catch (IOException | JSONException e) {
++ LOGGER.warn("Could not connect to the updateserver.", e);
+ return null;
+ }
+ }
+--- a/src/main/java/net/sf/jabref/logic/util/Version.java
++++ b/src/main/java/net/sf/jabref/logic/util/Version.java
+@@ -11,6 +11,7 @@
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.json.JSONObject;
++import org.json.JSONException;
+
+ /**
+ * Represents the Application Version with the major and minor number, the full Version String and if it's a developer version
+@@ -52,7 +53,7 @@
+ /**
+ * Grabs the latest release version from the JabRef GitHub repository
+ */
+- public static Version getLatestVersion() throws IOException {
++ public static Version getLatestVersion() throws IOException, JSONException {
+ URLConnection connection = new URL(JABREF_GITHUB_URL).openConnection();
+ connection.setRequestProperty("Accept-Charset", "UTF-8");
+ BufferedReader rd = new BufferedReader(new InputStreamReader(connection.getInputStream()));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git
More information about the pkg-java-commits
mailing list