Revert "Refactor setting authenticatedPriority = defaultPriority outs…

…ide if block #56"

This reverts commit a183af2.

src/main/java/org/icatproject/topcat/PriorityMap.java

@@ -60,21 +60,20 @@ public PriorityMap() {
      * @param authenticatedString The value read from the run.properties file
      */
     private void setAuthenticatedPriority(String authenticatedString) {
-        String msg = "";
         authenticatedPriority = Integer.valueOf(authenticatedString);
         if (authenticatedPriority < 1 && defaultPriority >= 1) {
-            msg += "queue.priority.authenticated disabled with value " + authenticatedString;
+            String msg = "queue.priority.authenticated disabled with value " + authenticatedString;
             msg += " but queue.priority.default enabled with value " + defaultPriority;
+            msg += "\nAuthenticated users will use default priority if no superseding priority applies";
             logger.warn(msg);
             authenticatedPriority = defaultPriority;
         } else if (authenticatedPriority >= 1 && authenticatedPriority > defaultPriority) {
-            msg += "queue.priority.authenticated enabled with value " + authenticatedString;
+            String msg = "queue.priority.authenticated enabled with value " + authenticatedString;
             msg += " but queue.priority.default supersedes with value " + defaultPriority;
-        } else {
-            return;  // Explicit authenticatedPriority OK, so no need to warn or use defaultPriority 
+            msg += "\nAuthenticated users will use default priority if no superseding priority applies";
+            logger.warn(msg);
+            authenticatedPriority = defaultPriority;
         }
-        logger.warn(msg + "\nAuthenticated users will use default priority if no superseding priority applies");
-        authenticatedPriority = defaultPriority;
     }
 
     /**