Browse Source

Merge pull request #2051 from zapov/round13

Revenj update bugfix for Round 13.
Mike Smith 9 years ago
parent
commit
23fe2e6d75

+ 3 - 0
frameworks/CSharp/revenj/Revenj.Bench/RestService.cs

@@ -129,6 +129,8 @@ namespace Revenj.Bench
 			return cms;
 		}
 
+		private static readonly Comparison<World> ASC = (l, r) => l.id - r.id;
+
 		public Stream Updates(string count)
 		{
 			int repeat;
@@ -141,6 +143,7 @@ namespace Revenj.Bench
 			Array.Copy(ctx.Worlds, result, repeat);
 			for (int i = 0; i < result.Length; i++)
 				result[i].randomNumber = Random.Next(10000) + 1;
+			Array.Sort(result, ASC);
 			ctx.Repository.Update(result);
 			var cms = ctx.Stream;
 			result.Serialize(cms);

+ 4 - 1
frameworks/Java/revenj/src/main/java/hello/UpdatesServlet.java

@@ -6,10 +6,12 @@ import dsl.FrameworkBench.World;
 import javax.servlet.ServletException;
 import javax.servlet.http.*;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.*;
 
 public class UpdatesServlet extends HttpServlet {
 
+	private static final Comparator<World> ASC = (l, r) -> l.getId() - r.getId();
+
 	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
 		res.setContentType("application/json");
@@ -22,6 +24,7 @@ public class UpdatesServlet extends HttpServlet {
 		for (int i = 0; i < count; i++) {
 			changed.add(worlds[i].setRandomNumber(ctx.getRandom10k()));
 		}
+		Collections.sort(changed, ASC);
 		ctx.repository.update(changed);
 		json.serialize(worlds, count);
 		json.toStream(res.getOutputStream());