Merge branch '2.1.x'

2019-11-06 12:38:51 +01:00
parent 36348da595 de372ed224
commit 1ac427a20a
3 changed files with 75 additions and 0 deletions
--- a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Common.java
+++ b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/Common.java
@@ -275,6 +275,9 @@ public class Common {

 	public void assertThatSidesMatch(Object firstSide, Object secondSide) {
 		if (firstSide instanceof OptionalProperty) {
+			if (secondSide == null) {
+				return;
+			}
 			assertThat(
 					secondSide.toString()
 							.matches(((OptionalProperty) firstSide).optionalPattern()),