Skip to content

Commit 7b14983

Browse files
fix: fix equality check in NavigationAccessControl (#21083) (#21092)
Fixes #21082 Co-authored-by: Marco Collovati <[email protected]>
1 parent 0ef16f5 commit 7b14983

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

flow-server/src/main/java/com/vaadin/flow/server/auth/NavigationAccessControl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ protected Class<? extends Component> getLoginView() {
216216
* the frontend view to use as login view
217217
*/
218218
public void setLoginView(String loginUrl) {
219-
if (loginUrl == this.loginUrl) {
219+
if (Objects.equals(loginUrl, this.loginUrl)) {
220220
// Probably hot reload
221221
return;
222222
}

flow-server/src/test/java/com/vaadin/flow/server/auth/NavigationAccessControlTest.java

+8
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,14 @@ public void setLoginViewClassCannotBeCalledAfterSettingString() {
279279
accessControl.setLoginView(TestLoginView.class);
280280
}
281281

282+
@Test
283+
public void setLoginViewStringShouldNotThrowWithSameString() {
284+
accessControl.setLoginView("/foo");
285+
accessControl.setLoginView("/foo");
286+
accessControl.setLoginView(new String("/foo"));
287+
Assert.assertEquals("/foo", accessControl.getLoginUrl());
288+
}
289+
282290
@Test
283291
public void beforeEnter_loginView_accessToLoginViewAlwaysAllowed() {
284292
mockCheckerResult(checker1, AccessCheckDecision.DENY);

0 commit comments

Comments
 (0)