From bab6839f38262a228da6c9a193972cf6def2616a Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Mon, 11 Mar 2013 11:48:23 -0700
Subject: [PATCH] CLOUDSTACK-1621: listProjectInvitations fails with NPE for
 valid requests.

---
 .../com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java | 4 +++-
 .../src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java
index ca0f171dd1a..1dfed3421bb 100644
--- a/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java
@@ -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());
diff --git a/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java b/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java
index a60c9370530..f6e67609c79 100644
--- a/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java
@@ -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")