Improve Security

[lgpl/argeo-commons.git] / security / plugins / org.argeo.security.ui.admin / src / main / java / org / argeo / security / ui / admin / views / UsersView.java

diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java
index 4242436d479a1abadf9bbd782388f6a3bf2b9120..a41f20af5560daada24541d3a9f9a860f2445a2d 100644 (file)
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java
@@ -129,6 +129,7 @@ public class UsersView extends ViewPart implements ArgeoNames, ArgeoTypes,
                public String getColumnText(Object element, int columnIndex) {
                        try {
                                Node userHome = (Node) element;
+                               Node userProfile = userHome.getNode(ARGEO_PROFILE);
                                switch (columnIndex) {
                                case 0:
                                        String userName = userHome.getProperty(ARGEO_USER_ID)
@@ -138,14 +139,14 @@ public class UsersView extends ViewPart implements ArgeoNames, ArgeoTypes,
                                        else
                                                return userName;
                                case 1:
-                                       return userHome.getNode(ARGEO_PROFILE)
-                                                       .getProperty(ARGEO_FIRST_NAME).getString();
+                                       return userProfile.hasProperty(ARGEO_FIRST_NAME) ? userProfile
+                                                       .getProperty(ARGEO_FIRST_NAME).getString() : "";
                                case 2:
-                                       return userHome.getNode(ARGEO_PROFILE)
-                                                       .getProperty(ARGEO_LAST_NAME).getString();
+                                       return userProfile.hasProperty(ARGEO_LAST_NAME) ? userProfile
+                                                       .getProperty(ARGEO_LAST_NAME).getString() : "";
                                case 3:
-                                       return userHome.getNode(ARGEO_PROFILE)
-                                                       .getProperty(ARGEO_PRIMARY_EMAIL).getString();
+                                       return userProfile.hasProperty(ARGEO_PRIMARY_EMAIL) ? userProfile
+                                                       .getProperty(ARGEO_PRIMARY_EMAIL).getString() : "";
                                default:
                                        throw new ArgeoException("Unmanaged column " + columnIndex);
                                }