Merge branch '5.3.x'

# Conflicts:
#	spring-context/src/test/java/org/springframework/context/annotation/Gh29105Tests.java

spring-webmvc/src/main/java/org/springframework/web/servlet/handler/RequestMatchResult.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ public class RequestMatchResult {
 	 */
 	public RequestMatchResult(PathPattern pathPattern, PathContainer lookupPath) {
 		Assert.notNull(pathPattern, "PathPattern is required");
-		Assert.notNull(pathPattern, "PathContainer is required");
+		Assert.notNull(lookupPath, "PathContainer is required");
 
 		this.pattern = null;
 		this.lookupPath = null;