This is an automated email from the git hooks/post-receive script. New commit to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit cbe46a22bc69bc33c21ac4be743456aec0d42448 Author: servantie <servantie.c@gmail.com> Date: Tue Jun 14 11:43:38 2016 +0200 simplified code receiving --- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 17 +++++---------- .../jtimer/ui/report/TimerTaskUpdaterView.java | 24 ++++++++-------------- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java index 557a96a..03b25c5 100644 --- a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java +++ b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java @@ -152,19 +152,12 @@ public class TimerTaskSynchronizer implements DataEventListener { connection.setRequestMethod("POST"); postDataBytes = updateJsonString.getBytes(charset); connection.getOutputStream().write(postDataBytes); - //get the header fields - Map<String, List<String>> map = connection.getHeaderFields(); - //check for answer from server - for (Map.Entry<String, List<String>> entry : map.entrySet()) { - for (String s : entry.getValue()) { - //positive answer, synchronization accepted - if ("HTTP/1.1 200 OK".equals(s)) { + int code = connection.getResponseCode(); + if (code == 200) { hasUpdated = true; - } - else { - log.info("Error" + s); - } - } + } + else { + log.info("Error"); } } catch (MalformedURLException e) { log.error("URL malformed"); diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java index 24b697f..2bdd40a 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -462,21 +462,15 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener, connection.setRequestMethod("POST"); postDataBytes = updateJsonString.getBytes(charset); connection.getOutputStream().write(postDataBytes); - //get the header fields - Map<String, List<String>> map = connection.getHeaderFields(); - //check for answer from server - for (Map.Entry<String, List<String>> entry : map.entrySet()) { - for (String s : entry.getValue()) { - //positive answer, synchronization accepted - if (s.startsWith("HTTP/1.1 2")){ - log.info("OK git" + s); - hasUpdated = true; - } - else if ("HTTP/1.1 400 Bad Request".equals(s)) { - log.info("Bad Request (400)"); - } - log.info(s); - } + int code = connection.getResponseCode(); + if (code == 200) { + hasUpdated = true; + } + else if (code == 400) { + log.error("Bad Request"); + } + else { + log.info("Error"); } connection.disconnect(); } catch (MalformedURLException e) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.