Catch some json exceptions

jenkins-zh · Nov 13, 2020 · e1c7dff · e1c7dff
1 parent 1baf564
commit e1c7dff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -20,5 +20,5 @@ jobs:
         DOCKER_TOKEN: ${{ secrets.DOCKER }}
       run: |
         docker login docker.pkg.github.com --username LinuxSuRen --password ${DOCKER_TOKEN}
-        docker build . -t docker.pkg.github.com/jenkins-zh/mirror-adapter/mirror-adapter:0.0.5
-        docker push docker.pkg.github.com/jenkins-zh/mirror-adapter/mirror-adapter:0.0.5
+        docker build . -t docker.pkg.github.com/jenkins-zh/mirror-adapter/mirror-adapter:0.0.6
+        docker push docker.pkg.github.com/jenkins-zh/mirror-adapter/mirror-adapter:0.0.6
diff --git a/src/main/java/cn/jenkins/zh/updatecenter/MirrorAdapter.java b/src/main/java/cn/jenkins/zh/updatecenter/MirrorAdapter.java
@@ -1,5 +1,6 @@
 package cn.jenkins.zh.updatecenter;
 
+import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
 import org.apache.commons.io.IOUtils;
 import org.kohsuke.args4j.ClassParser;
@@ -94,9 +95,9 @@ private int signUpdateCenterJSON() throws IOException, GeneralSecurityException,
             return -2;
         }
 
+        ByteArrayOutputStream data = new ByteArrayOutputStream();
         try(InputStream input = new FileInputStream(officialJSON);
             FileOutputStream out = new FileOutputStream(mirrorJSON);) {
-            ByteArrayOutputStream data = new ByteArrayOutputStream();
             IOUtils.copy(input, data);
 
             String jsonStr = data.toString("UTF-8");
@@ -124,6 +125,9 @@ private int signUpdateCenterJSON() throws IOException, GeneralSecurityException,
 
             JSONObject result = signer.sign(json);
             out.write((jsonHeader + result.toString() + jsonFooter).getBytes());
+        } catch (JSONException e) {
+            e.printStackTrace();
+            System.err.println("Error happened when parse json file from '" + officialJSON + "', data is: " + data.toString());
         }
         return 0;
     }