From aedf3b5cb570d0aba8cad215f4a40da9ba956623 Mon Sep 17 00:00:00 2001
From: Simon Massey <simon@simonmassey.org>
Date: Tue, 30 Oct 2018 22:47:38 +0000
Subject: [PATCH] removed race condition between different requests

---
 .../thymeleaf/controller/BookController.java        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/BookController.java b/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/BookController.java
index b8132cddc8..12e8e8bc41 100644
--- a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/BookController.java
+++ b/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/BookController.java
@@ -2,6 +2,7 @@ package com.baeldung.thymeleaf.controller;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -21,18 +22,18 @@ import com.baeldung.thymeleaf.service.BookService;
 @Controller
 public class BookController {
 
-    private static int currentPage = 1;
-    private static int pageSize = 5;
 
     @Autowired
     private BookService bookService;
-  
+
     @RequestMapping(value = "/listBooks", method = RequestMethod.GET)
     public String listBooks(Model model, @RequestParam("page") Optional<Integer> page, @RequestParam("size") Optional<Integer> size) {
-        page.ifPresent(p -> currentPage = p);
-        size.ifPresent(s -> pageSize = s);
+        AtomicInteger currentPage = new AtomicInteger(1);
+        AtomicInteger pageSize = new AtomicInteger(5);
+        page.ifPresent(p -> currentPage.set(p));
+        size.ifPresent(s -> pageSize.set(s));
 
-        Page<Book> bookPage = bookService.findPaginated(PageRequest.of(currentPage - 1, pageSize));
+        Page<Book> bookPage = bookService.findPaginated(PageRequest.of(currentPage.get() - 1, pageSize.get()));
 
         model.addAttribute("bookPage", bookPage);