Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Solve 500 errors being returned by server when creating users.
(rhbz746857)
Reinstate XmlRootElement on Account object.
Correct NullPointerException when accessing non-existing language memberships in the HAccount class.
  • Loading branch information
Carlos committed Jan 6, 2012
1 parent bde178f commit c92668f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
Expand Up @@ -6,6 +6,7 @@

import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;

import org.codehaus.jackson.annotate.JsonIgnoreProperties;
Expand All @@ -19,6 +20,7 @@
import org.zanata.rest.MediaTypes.Format;

@XmlType(name = "accountType")
@XmlRootElement(name = "account")
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonPropertyOrder(
{"email", "name", "username", "password"})
Expand Down
Expand Up @@ -118,7 +118,7 @@ public void setMaintainerProjects(Set<HProject> maintainerProjects)
public Set<HLocale> getLanguageMemberships()
{
final Set<HLocale> memberships = new HashSet<HLocale>();
for( HLocaleMember locMem : this.languageTeamMemberships )
for( HLocaleMember locMem : this.getLanguageTeamMemberships() )
{
memberships.add( locMem.getSupportedLanguage() );
}
Expand Down

0 comments on commit c92668f

Please sign in to comment.