Commit aa546b3f authored by Jay Kline's avatar Jay Kline Committed by jay

Perform null checking for JM-1463


git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@11019 b35dd754-fafc-0310-a699-88a17e54d16e
parent 4aa13ffb
...@@ -100,9 +100,9 @@ public class UserServicePlugin implements Plugin, PropertyEventListener { ...@@ -100,9 +100,9 @@ public class UserServicePlugin implements Plugin, PropertyEventListener {
throws UserNotFoundException throws UserNotFoundException
{ {
User user = getUser(username); User user = getUser(username);
user.setPassword(password); if (password != null) user.setPassword(password);
user.setName(name); if (name != null) user.setName(name);
user.setEmail(email); if (email != null) user.setEmail(email);
if (groupNames != null) { if (groupNames != null) {
Collection<Group> newGroups = new ArrayList<Group>(); Collection<Group> newGroups = new ArrayList<Group>();
...@@ -233,4 +233,4 @@ public class UserServicePlugin implements Plugin, PropertyEventListener { ...@@ -233,4 +233,4 @@ public class UserServicePlugin implements Plugin, PropertyEventListener {
public void xmlPropertyDeleted(String property, Map<String, Object> params) { public void xmlPropertyDeleted(String property, Map<String, Object> params) {
// Do nothing // Do nothing
} }
} }
\ No newline at end of file
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