Skip to content

Commit e6b77d3

Browse files
committed
Merge branch '6.1.x'
2 parents b134f25 + 000b563 commit e6b77d3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

spring-web/src/main/java/org/springframework/http/client/JdkClientHttpRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ else if (contentLength == 0) {
176176
/**
177177
* By default, {@link HttpRequest} does not allow {@code Connection},
178178
* {@code Content-Length}, {@code Expect}, {@code Host}, or {@code Upgrade}
179-
* headers to be set, but this can be overriden with the
179+
* headers to be set, but this can be overridden with the
180180
* {@code jdk.httpclient.allowRestrictedHeaders} system property.
181181
* @see jdk.internal.net.http.common.Utils#getDisallowedHeaders()
182182
*/

spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -495,7 +495,7 @@ public String toString() {
495495
}
496496

497497
protected String formatViewName() {
498-
return (getBeanName() != null ? "name '" + getBeanName() + "'" : "[" + getClass().getSimpleName() + "]");
498+
return (getBeanName() != null ? "name [" + getBeanName() + "]" : "[" + getClass().getSimpleName() + "]");
499499
}
500500

501501
}

0 commit comments

Comments
 (0)