Merge branch '5.6.x' into 5.7.x

jzheaux · jzheaux · commit 6efac34ca77a · 2022-11-01T18:06:01.000-06:00
Closes gh-12125
diff --git a/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java b/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java
@@ -102,6 +102,7 @@ public BeanDefinition parse(Element element, ParserContext pc) {
 		if (parser == null) {
 			// SEC-1455. Load parsers when required, not just on init().
 			loadParsers();
+			parser = this.parsers.get(name);
 		}
 		if (parser != null) {
 			return parser.parse(element, pc);

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ public BeanDefinition parse(Element element, ParserContext pc) {`
`102`	`102`	`if (parser == null) {`
`103`	`103`	`// SEC-1455. Load parsers when required, not just on init().`
`104`	`104`	`loadParsers();`
	`105`	`+ parser = this.parsers.get(name);`
`105`	`106`	`}`
`106`	`107`	`if (parser != null) {`
`107`	`108`	`return parser.parse(element, pc);`