Mercurial > dive4elements > framework
diff artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java @ 417:410a1bfb9590
Fix for NPE on empty user database
artifacts/trunk@5270 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Christian Lins <christian.lins@intevation.de> |
---|---|
date | Mon, 27 Aug 2012 08:33:05 +0000 |
parents | d4a846ee35b8 |
children | 8d8aed23c323 |
line wrap: on
line diff
--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java Fri Aug 24 14:09:53 2012 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java Mon Aug 27 08:33:05 2012 +0000 @@ -1217,23 +1217,25 @@ Element root = ec.create("users"); result.appendChild(root); + + if(users != null) { + for (User user: users) { + Element ue = ec.create("user"); + ec.addAttr(ue, "uuid", user.identifier(), true); + ec.addAttr(ue, "name", user.getName(), true); + Element ua = ec.create("account"); + ec.addAttr(ua, "name", user.getAccount(), true); + ue.appendChild(ua); - for (User user: users) { - Element ue = ec.create("user"); - ec.addAttr(ue, "uuid", user.identifier(), true); - ec.addAttr(ue, "name", user.getName(), true); - Element ua = ec.create("account"); - ec.addAttr(ua, "name", user.getAccount(), true); - ue.appendChild(ua); + Document role = user.getRole(); - Document role = user.getRole(); + if (role != null) { + ue.appendChild(result.importNode(role.getFirstChild(), true)); + } - if (role != null) { - ue.appendChild(result.importNode(role.getFirstChild(), true)); + root.appendChild(ue); + } - - root.appendChild(ue); - } return result;