Merge remote-tracking branch 'origin/fix/move-blocking-calls-outside-…

…session-lock' into fix/move-blocking-calls-outside-session-lock
vaadin · Nov 15, 2024 · 9717409 · 9717409
2 parents abd2f8a + bf5338a
commit 9717409
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/server/communication/ServerRpcHandler.java b/flow-server/src/main/java/com/vaadin/flow/server/communication/ServerRpcHandler.java
@@ -569,6 +569,7 @@ private static void callErrorHandler(UI ui, JsonObject invocationJson,
         ui.getSession().getErrorHandler().error(event);
     }
 
+<<<<<<< HEAD
     protected String getMessage(Reader reader) throws IOException {
 
         StringBuilder sb = new StringBuilder(
@@ -586,6 +587,8 @@ protected String getMessage(Reader reader) throws IOException {
         return sb.toString();
     }
 
+=======
+>>>>>>> origin/fix/move-blocking-calls-outside-session-lock
     private static Logger getLogger() {
         return LoggerFactory.getLogger(ServerRpcHandler.class.getName());
     }