Commit 86814abb authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

Minor fix

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3717 b35dd754-fafc-0310-a699-88a17e54d16e
parent 3b9708bc
...@@ -128,7 +128,8 @@ public class Group implements Cacheable { ...@@ -128,7 +128,8 @@ public class Group implements Cacheable {
* @param name the name for the group. * @param name the name for the group.
*/ */
public void setName(String name) { public void setName(String name) {
if (name == this.name || name.equals(this.name) || provider.isReadOnly()) { if (name == this.name || (name != null && name.equals(this.name)) || provider.isReadOnly())
{
// Do nothing // Do nothing
return; return;
} }
...@@ -170,7 +171,8 @@ public class Group implements Cacheable { ...@@ -170,7 +171,8 @@ public class Group implements Cacheable {
* @param description the description of the group. * @param description the description of the group.
*/ */
public void setDescription(String description) { public void setDescription(String description) {
if (description == this.description || description.equals(this.description) || if (description == this.description ||
(description != null && description.equals(this.description)) ||
provider.isReadOnly()) { provider.isReadOnly()) {
// Do nothing // Do nothing
return; return;
......
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