Skip to content

Commit e127d54

Browse files
vaadin-botcaalador
andauthored
fix: no empty first line in log (#22523) (#22539)
Added message to not log with "" and throwable. fixes #22522 Co-authored-by: caalador <mikael.grankvist@vaadin.com>
1 parent 624d862 commit e127d54

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

flow-server/src/main/java/com/vaadin/flow/server/DefaultErrorHandler.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ public void error(ErrorEvent event) {
9393
Marker marker = MarkerFactory.getMarker("INVALID_LOCATION");
9494
if (throwable instanceof InvalidLocationException) {
9595
if (getLogger().isWarnEnabled(marker)) {
96-
getLogger().warn(marker, "", throwable);
96+
getLogger().warn(marker, "Invalid location: {}",
97+
throwable.getMessage(), throwable);
9798
}
9899
} else {
99100
if (routeConfigurationExceptions
@@ -102,7 +103,8 @@ public void error(ErrorEvent event) {
102103
getLogger().error(throwable.getMessage());
103104
} else {
104105
// print the error on console
105-
getLogger().error("", throwable);
106+
getLogger().error("Unexpected error: {}",
107+
throwable.getMessage(), throwable);
106108
}
107109
}
108110
}

flow-server/src/test/java/com/vaadin/flow/server/DefaultErrorHandlerTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ public void error_acceptedException_errorHandled() {
6060

6161
Throwable throwable = new RuntimeException();
6262
errorHandler.error(new ErrorEvent(throwable));
63-
Mockito.verify(logger).error("", throwable);
63+
Mockito.verify(logger).error("Unexpected error: {}", null, throwable);
6464

6565
throwable = new IllegalArgumentException();
6666
errorHandler.error(new ErrorEvent(throwable));
67-
Mockito.verify(logger).error("", throwable);
67+
Mockito.verify(logger).error("Unexpected error: {}", null, throwable);
6868
}
6969

7070
@Test
@@ -90,7 +90,7 @@ public void error_subclassOfIgnoredException_errorHandled() {
9090

9191
Throwable throwable = new MalformedURLException();
9292
errorHandler.error(new ErrorEvent(throwable));
93-
Mockito.verify(logger).error("", throwable);
93+
Mockito.verify(logger).error("Unexpected error: {}", null, throwable);
9494
}
9595

9696
@Test
@@ -105,23 +105,24 @@ public void error_loggerAtDebugLevel_errorHandled() {
105105

106106
Throwable throwable = new RuntimeException();
107107
errorHandler.error(new ErrorEvent(throwable));
108-
Mockito.verify(logger).error("", throwable);
108+
Mockito.verify(logger).error("Unexpected error: {}", null, throwable);
109109

110110
throwable = new IOException();
111111
errorHandler.error(new ErrorEvent(throwable));
112-
Mockito.verify(logger).error("", throwable);
112+
Mockito.verify(logger).error("Unexpected error: {}", null, throwable);
113113

114114
throwable = new MalformedURLException();
115115
errorHandler.error(new ErrorEvent(throwable));
116-
Mockito.verify(logger).error("", throwable);
116+
Mockito.verify(logger).error("Unexpected error: {}", null, throwable);
117117

118118
throwable = new InnerException();
119119
errorHandler.error(new ErrorEvent(throwable));
120-
Mockito.verify(logger).error("", throwable);
120+
Mockito.verify(logger).error("Unexpected error: {}", null, throwable);
121121

122122
throwable = new UncheckedIOException(new IOException());
123123
errorHandler.error(new ErrorEvent(throwable));
124-
Mockito.verify(logger).error("", throwable);
124+
Mockito.verify(logger).error("Unexpected error: {}",
125+
"java.io.IOException", throwable);
125126
}
126127

127128
public static class InnerException extends Exception {

0 commit comments

Comments
 (0)