Author: tchemit Date: 2014-05-12 14:00:23 +0200 (Mon, 12 May 2014) New Revision: 3929 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3929 Log: use a copy Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java 2014-05-12 11:58:42 UTC (rev 3928) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java 2014-05-12 12:00:23 UTC (rev 3929) @@ -23,7 +23,6 @@ * #L% */ -import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.persistence.entity.Choice; @@ -51,7 +50,7 @@ Poll poll = getPollService().getPoll(pollId); List<Choice> choices = getChoiceDao().findAll(poll); - return ImmutableList.copyOf(choices); + return copyAsList(choices); } @@ -64,7 +63,7 @@ Poll poll = getPollService().getPoll(pollId); Choice result = getChoice(poll, choiceId); - return result; + return copy(result); } @@ -114,7 +113,7 @@ getNotificationService().onChoiceAdded(poll, result); - return result; + return copy(result); } @@ -135,7 +134,7 @@ getNotificationService().onChoiceEdited(poll, result); - return result; + return copy(result); } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java 2014-05-12 11:58:42 UTC (rev 3928) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java 2014-05-12 12:00:23 UTC (rev 3929) @@ -46,7 +46,7 @@ Poll poll = getPollService().getPoll(pollId); List<Comment> comments = getCommentDao().forPollEquals(poll).findAll(); - return ImmutableList.copyOf(comments); + return copyAsList(comments); } @@ -59,7 +59,7 @@ Poll poll = getPollService().getPoll(pollId); Comment result = getComment(poll, commentId); - return result; + return copy(result); } @@ -79,7 +79,7 @@ getNotificationService().onCommentAdded(poll, result); - return result; + return copy(result); } @@ -99,7 +99,7 @@ getNotificationService().onCommentEdited(poll, result); - return result; + return copy(result); }