Merge remote-tracking branch 'origin/master'

# Conflicts: # src/test/java/uk/q3c/util/MessageFormatTest.java
KrailOrg · Jul 30, 2017 · 2f893c9 · 2f893c9
2 parents 7c10c2a + 8285f3d
commit 2f893c9
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/main/java/uk/q3c/util/MessageFormat.java b/src/main/java/uk/q3c/util/MessageFormat.java
@@ -115,17 +115,16 @@ private static String scanForParameters(String pattern, List<Integer> parameters
     }
 
     private static Object[] sortArguments(List<Integer> parameters, Object[] arguments, String pattern) {
-        try {
-            List<Object> sortedArguments = new ArrayList<>();
-            for (Integer i : parameters) {
-                sortedArguments.add(arguments[i]);
-            }
-            return sortedArguments.toArray();
-        } catch (IndexOutOfBoundsException e) {
-            Object[] args = new Object[] { parameters.size(), arguments.length, pattern };
-            log.warn("Message pattern and arguments do not match, there are {} parameters in the pattern, "
-                    + "and {} arguments. The pattern is: '{}'", args);
+        if (parameters.size() != arguments.length) {
+            Object[] args = new Object[]{parameters.size(), arguments.length, pattern};
+            log.warn("Message pattern and arguments do not match, there are {} parameters in the pattern, " +
+                    "and {} arguments. The pattern is: '{}'", args);
             throw new RuntimeException();
         }
+        List<Object> sortedArguments = new ArrayList<>();
+        for (Integer i : parameters) {
+            sortedArguments.add(arguments[i]);
+        }
+        return sortedArguments.toArray();
     }
 }