Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory james.mmbase.org:/tmp/cvs-serv7220/impl
Modified Files:
Tag: b1_5
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.26.2.2
retrieving revision 1.26.2.3
diff -u -b -r1.26.2.2 -r1.26.2.3
--- NewsletterSubscriptionServicesImpl.java 24 Oct 2008 02:24:17 -0000
1.26.2.2
+++ NewsletterSubscriptionServicesImpl.java 30 Oct 2008 09:09:01 -0000
1.26.2.3
@@ -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) {
@@ -399,4 +403,16 @@
}
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
