Declare all possibly-static methods as static.

[jSite.git] / src / de / todesbaum / jsite / application / UpdateChecker.java

diff --git a/src/de/todesbaum/jsite/application/UpdateChecker.java b/src/de/todesbaum/jsite/application/UpdateChecker.java
index a80eb4f..0fefcc2 100644 (file)
--- a/src/de/todesbaum/jsite/application/UpdateChecker.java
+++ b/src/de/todesbaum/jsite/application/UpdateChecker.java
@@ -1,6 +1,5 @@
 /*
- * jSite-remote - UpdateChecker.java -
- * Copyright © 2008 David Roden
+ * jSite - UpdateChecker.java - Copyright © 2008–2012 David Roden
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,7 +51,7 @@ public class UpdateChecker implements Runnable {
        private static int counter = 0;
 
        /** The edition for the update check URL. */
-       private static final int UPDATE_EDITION = 11;
+       private static final int UPDATE_EDITION = 17;
 
        /** The URL for update checks. */
        private static final String UPDATE_KEY = "USK@e3myoFyp5avg6WYN16ImHri6J7Nj8980Fm~aQe4EX1U,QvbWT0ImE0TwLODTl7EoJx2NBnwDxTbLTE6zkB-eGPs,AQACAAE";
@@ -181,7 +180,7 @@ public class UpdateChecker implements Runnable {
         *            The edition number
         * @return The URI for the update file for the given edition
         */
-       private String constructUpdateKey(int edition) {
+       private static String constructUpdateKey(int edition) {
                return UPDATE_KEY + "/jSite/" + edition + "/jSite.properties";
        }
 
@@ -192,6 +191,7 @@ public class UpdateChecker implements Runnable {
        /**
         * {@inheritDoc}
         */
+       @Override
        public void run() {
                Connection connection = freenetInterface.getConnection("jSite-" + ++counter + "-UpdateChecker");
                try {
@@ -216,6 +216,9 @@ public class UpdateChecker implements Runnable {
                                while (!stop) {
                                        Message message = client.readMessage();
                                        logger.log(Level.FINEST, "Received message: " + message);
+                                       if (message == null) {
+                                               break;
+                                       }
                                        if ("GetFailed".equals(message.getName())) {
                                                if ("27".equals(message.get("code"))) {
                                                        String editionString = message.get("redirecturi").split("/")[2];