Fix for #83 sort functions inside existing synchronized block.

Rankings of exposed functions on the REST mapper are treated as final so they can be sorted when added rather than for each request. Signed-off-by: Elias N Vasylenko <[email protected]>
osgi · Mar 23, 2017 · 8f25091 · 8f25091
1 parent a6cccee
commit 8f25091
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/osgi.enroute.rest.simple.provider/src/osgi/enroute/rest/simple/provider/RestMapper.java b/osgi.enroute.rest.simple.provider/src/osgi/enroute/rest/simple/provider/RestMapper.java
@@ -156,6 +156,9 @@ public synchronized void addResource(REST resource, int ranking) {
 
 			Function function = new Function(resource, m, verb, path, ranking);
 			functions.add(function.getName(), function);
+
+			Collections.sort(functions.get(function.getName()),
+					(a, b) -> Integer.compare(a.ranking, b.ranking));
 		}
 		endpoints.add(resource);
 	}
@@ -259,9 +262,6 @@ public boolean execute(HttpServletRequest rq, HttpServletResponse rsp)
 				throw new FileNotFoundException("No such method " + name + "/"
 						+ cardinality + ". Available: " + functions);
 
-			Collections.sort(candidates,
-					(a, b) -> Integer.compare(a.ranking, b.ranking));
-
 			//
 			// All values are arrays, turn them into singletons when
 			// they have one element