Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-05 23:29:53 +01:00
Code Issues Packages Projects Releases Activity

fix possible npe on add method of group

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-10-13 13:39:45 +02:00
parent f6042f65c4
commit 635e0c02af
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scm-core/src/main/java/sonia/scm/group/Group.java
View File

@@ -36,6 +36,7 @@ package sonia.scm.group;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import sonia.scm.BasicPropertiesAware;
import sonia.scm.ModelObject;
@@ -44,7 +45,6 @@ import sonia.scm.util.ValidationUtil;
//~--- JDK imports ------------------------------------------------------------
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -61,7 +61,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "groups")
@XmlAccessorType(XmlAccessType.FIELD)
public class Group extends BasicPropertiesAware
implements ModelObject, Iterable<String>
implements ModelObject, Iterable<String>
{
/** Field description */
@@ -87,7 +87,7 @@ public class Group extends BasicPropertiesAware
{
this.type = type;
this.name = name;
this.members = new ArrayList<String>();
this.members = Lists.newArrayList();
}
/**
@@ -119,7 +119,7 @@ public class Group extends BasicPropertiesAware
{
this.type = type;
this.name = name;
this.members = new ArrayList<String>();
this.members = Lists.newArrayList();
if (Util.isNotEmpty(members))
{
@@ -139,7 +139,7 @@ public class Group extends BasicPropertiesAware
*/
public boolean add(String member)
{
return members.add(member);
return getMembers().add(member);
}
/**
@@ -213,12 +213,12 @@ public class Group extends BasicPropertiesAware
final Group other = (Group) obj;
return Objects.equal(name, other.name)
&& Objects.equal(description, other.description)
&& Objects.equal(members, other.members)
&& Objects.equal(type, other.type)
&& Objects.equal(creationDate, other.creationDate)
&& Objects.equal(lastModified, other.lastModified)
&& Objects.equal(properties, other.properties);
&& Objects.equal(description, other.description)
&& Objects.equal(members, other.members)
&& Objects.equal(type, other.type)
&& Objects.equal(creationDate, other.creationDate)
&& Objects.equal(lastModified, other.lastModified)
&& Objects.equal(properties, other.properties);
}
/**
@@ -231,7 +231,7 @@ public class Group extends BasicPropertiesAware
public int hashCode()
{
return Objects.hashCode(name, description, members, type, creationDate,
lastModified, properties);
lastModified, properties);
}
/**
@@ -340,7 +340,7 @@ public class Group extends BasicPropertiesAware
{
if (members == null)
{
members = new ArrayList<String>();
members = Lists.newArrayList();
}
return members;