etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-1621: listProjectInvitations fails with NPE for valid requests.

This commit is contained in:
Min Chen 2013-03-11 11:48:23 -07:00
parent 85e9d63be4
commit bab6839f38
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java
View File

@ -56,7 +56,9 @@ public class ProjectInvitationJoinDaoImpl extends GenericDaoBase<ProjectInvitati
response.setId(invite.getUuid());
response.setProjectId(invite.getProjectUuid());
response.setProjectName(invite.getProjectName());
response.setInvitationState(invite.getState().toString());
if (invite.getState() != null) {
response.setInvitationState(invite.getState().toString());
}
if (invite.getAccountName() != null) {
response.setAccountName(invite.getAccountName());

3
server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java
View File

@ -25,8 +25,9 @@ import javax.persistence.Enumerated;
import javax.persistence.Id;
import javax.persistence.Table;
import com.cloud.projects.ProjectInvitation.State;
import com.cloud.utils.db.GenericDao;
import com.cloud.vm.VirtualMachine.State;
@Entity
@Table(name="project_invitation_view")