Author: tchemit Date: 2012-03-15 07:47:10 +0100 (Thu, 15 Mar 2012) New Revision: 3193 Url: http://chorem.org/repositories/revision/pollen/3193 Log: fix NPE Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java 2012-03-15 06:09:01 UTC (rev 3192) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java 2012-03-15 06:47:10 UTC (rev 3193) @@ -50,7 +50,10 @@ @Override public String getVoteId(PollAccount account) { - String accountId = account.getAccountId(); - return getPollId() + ":" + accountId; + String voteId = getPollId(); + if (account != null) { + voteId += ":" + account.getAccountId(); + } + return voteId; } } //PollImpl