Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl In directory james.mmbase.org:/tmp/cvs-serv4467/impl
Modified Files: NewsletterSubscriptionServicesImpl.java Log Message: CMSC-1110, Import newsletter subscription data gives stacktrace,add validate servserce See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl See also: http://www.mmbase.org/jira/browse/CMSC-1110 Index: NewsletterSubscriptionServicesImpl.java =================================================================== RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -b -r1.31 -r1.32 --- NewsletterSubscriptionServicesImpl.java 28 Oct 2008 11:13:36 -0000 1.31 +++ NewsletterSubscriptionServicesImpl.java 30 Oct 2008 07:38:06 -0000 1.32 @@ -316,7 +316,11 @@ } public Subscription getSubscription(int userId, int newsletterId) { + if (isAbleSubscrip(userId,newsletterId)) { return subscriptionCAO.getSubscription(newsletterId, userId); + }else{ + return null; + } } public void unSubscribeAllInNewsletter(int newsletterId) { @@ -400,5 +404,15 @@ return subscriberIds; } + public boolean isAbleSubscrip(int userId, int newsletterId) { + + if (null == personService.getPersonByUserId(String.valueOf(userId)) + || null == newsletterService.getNewsletterName(newsletterId)) { + return false; + } else { + return true; + } + } + } _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs