Prefer existing Context in ReactorContextTestExecutionListener

Issue gh-4718
2017-10-27 09:59:13 -05:00
parent 9363e2ba41
commit be593b95a8
2 changed files with 20 additions and 1 deletions
--- a/test/src/main/java/org/springframework/security/test/context/support/ReactorContextTestExecutionListener.java
+++ b/test/src/main/java/org/springframework/security/test/context/support/ReactorContextTestExecutionListener.java
@@ -77,7 +77,7 @@ public class ReactorContextTestExecutionListener
 					return context;
 				}
 				Context toMerge = ReactiveSecurityContextHolder.withAuthentication(authentication);
-				return context.putAll(toMerge);
+				return toMerge.putAll(context);
 			}

 			@Override