From b2c11c959d104c1fd54b1986483929d1216f7385 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Mon, 18 Dec 2017 16:01:18 +0100
Subject: [PATCH] BVAL-703 Reallow null values in ConstraintViolationException
 second constructor

---
 .../validation/ConstraintViolationException.java   | 14 +++++++++-----
 .../ConstraintViolationExceptionTest.java          |  5 +++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/javax/validation/ConstraintViolationException.java b/src/main/java/javax/validation/ConstraintViolationException.java
index 9fdb93bf..92146f1b 100644
--- a/src/main/java/javax/validation/ConstraintViolationException.java
+++ b/src/main/java/javax/validation/ConstraintViolationException.java
@@ -15,6 +15,7 @@
  *
  * @author Emmanuel Bernard
  * @author Gunnar Morling
+ * @author Guillaume Smet
  */
 public class ConstraintViolationException extends ValidationException {
 
@@ -24,7 +25,7 @@ public class ConstraintViolationException extends ValidationException {
 	 * Creates a constraint violation report.
 	 *
 	 * @param message error message
-	 * @param constraintViolations {@code Set} of {@link ConstraintViolation}
+	 * @param constraintViolations a {@code Set} of {@link ConstraintViolation}s or null
 	 */
 	public ConstraintViolationException(String message,
 										Set<? extends ConstraintViolation<?>> constraintViolations) {
@@ -41,16 +42,19 @@ public ConstraintViolationException(String message,
 	/**
 	 * Creates a constraint violation report.
 	 *
-	 * @param constraintViolations {@code Set} of {@link ConstraintViolation}
+	 * @param constraintViolations a {@code Set} of {@link ConstraintViolation}s or null
 	 */
 	public ConstraintViolationException(Set<? extends ConstraintViolation<?>> constraintViolations) {
-		this( toString( constraintViolations ), constraintViolations );
+		this(
+				constraintViolations != null ? toString( constraintViolations ) : null,
+				constraintViolations
+		);
 	}
 
 	/**
-	 * Set of constraint violations reported during a validation.
+	 * Returns the set of constraint violations reported during a validation.
 	 *
-	 * @return {@code Set} of {@link ConstraintViolation}
+	 * @return the {@code Set} of {@link ConstraintViolation}s or null
 	 */
 	public Set<ConstraintViolation<?>> getConstraintViolations() {
 		return constraintViolations;
diff --git a/src/test/java/javax/validation/ConstraintViolationExceptionTest.java b/src/test/java/javax/validation/ConstraintViolationExceptionTest.java
index b0b265c8..4c7d0be4 100644
--- a/src/test/java/javax/validation/ConstraintViolationExceptionTest.java
+++ b/src/test/java/javax/validation/ConstraintViolationExceptionTest.java
@@ -57,6 +57,11 @@ public void testCreationOfConstraintViolationExceptionWithoutViolations() {
 
 		assertNull( constraintViolationException.getConstraintViolations() );
 		assertNull( constraintViolationException.getMessage() );
+
+		constraintViolationException = new ConstraintViolationException( null );
+
+		assertNull( constraintViolationException.getConstraintViolations() );
+		assertNull( constraintViolationException.getMessage() );
 	}
 
 	/**