Commit 5ee7a369 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gaston

Modified #getName() to return an empty string if name is null.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@720 b35dd754-fafc-0310-a699-88a17e54d16e
parent 459288d1
...@@ -101,7 +101,7 @@ public class User implements Cacheable { ...@@ -101,7 +101,7 @@ public class User implements Cacheable {
} }
public String getName() { public String getName() {
return name; return name == null ? "" : name;
} }
public void setName(String name) { public void setName(String name) {
......
...@@ -115,7 +115,7 @@ Use the form below to edit user properties. ...@@ -115,7 +115,7 @@ Use the form below to edit user properties.
</td> </td>
<td> <td>
<input type="text" size="30" maxlength="150" name="name" <input type="text" size="30" maxlength="150" name="name"
value="<%= ((user.getName()!=null) ? user.getName() : "") %>"> value="<%= user.getName() %>">
<% if (errors.get("name") != null) { %> <% if (errors.get("name") != null) { %>
......
...@@ -173,7 +173,7 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt ...@@ -173,7 +173,7 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt
Name: Name:
</td> </td>
<td> <td>
<% if (user.getName() == null || "".equals(user.getName())) { %> <% if ("".equals(user.getName())) { %>
<span style="color:#999"> <span style="color:#999">
<i>Not set.</i> <i>Not set.</i>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment