# HG changeset patch
# User Björn Ricks <bjoern.ricks@intevation.de>
# Date 1348833358 -7200
# Node ID da33275fb76556a01d37160757a3187cf3d926f8
# Parent  29bd60a3ee67b5ccf1528353baa2f8e71e4d6acb
Check if roleData is null before reading it

Fix for issue849

diff -r 29bd60a3ee67 -r da33275fb765 ChangeLog
--- a/ChangeLog	Fri Sep 28 12:16:04 2012 +0200
+++ b/ChangeLog	Fri Sep 28 13:55:58 2012 +0200
@@ -1,3 +1,8 @@
+2012-09-29	Björn Ricks	<bjoern.ricks@intevation.de>
+
+	* artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java:
+	  Check if roles from database is null. Fix for issue849.
+
 2012-09-26	Björn Ricks	<bjoern.ricks@intevation.de>
 
 	* artifact-database/src/main/java/de/intevation/artifactdatabase/state/AbstractState.java:
diff -r 29bd60a3ee67 -r da33275fb765 artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java
--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java	Fri Sep 28 12:16:04 2012 +0200
+++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java	Fri Sep 28 13:55:58 2012 +0200
@@ -972,7 +972,10 @@
                 String account   = result.getString(3);
                 byte [] roleData = result.getBytes(4);
 
-                Document role = XMLUtils.fromByteArray(roleData, true);
+                Document role = null;
+                if (roleData != null) {
+                    role = XMLUtils.fromByteArray(roleData, true);
+                }
 
                 user[0] = factory.createUser(
                     identifier, name, account, role, context);
@@ -1009,7 +1012,10 @@
                 String account   = result.getString(3);
                 byte [] roleData = result.getBytes(4);
 
-                Document role = XMLUtils.fromByteArray(roleData, true);
+                Document role = null;
+                if (roleData != null) {
+                    role = XMLUtils.fromByteArray(roleData, true);
+                }
 
                 user[0] = factory.createUser(
                     identifier, name, account, role, context);