[Bugfix] fixed NPE when Certificate is created with null properties

2014-01-28 22:19:15 +01:00 · 2014-01-28 22:19:15 +01:00 · 5e6423c443
parent 4627f59a80
commit 5e6423c443
1 changed files with 4 additions and 1 deletions
--- a/src/main/java/ch/eitchnet/privilege/model/Certificate.java
+++ b/src/main/java/ch/eitchnet/privilege/model/Certificate.java
@ -89,7 +89,10 @@ public final class Certificate implements Serializable {
 		else
 			this.locale = locale;

-		this.propertyMap = Collections.unmodifiableMap(propertyMap);
+		if (propertyMap == null)
+			this.propertyMap = Collections.emptyMap();
+		else
+			this.propertyMap = Collections.unmodifiableMap(propertyMap);
 	}

 	/**