Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory james.mmbase.org:/tmp/cvs-serv10845/services/impl
Modified Files:
NewsletterSubscriptionServicesImpl.java
Log Message:
CMSC-1097, Opening Newsletter Management first time gives stacktrace,add
CountSubscription
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-1097
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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- NewsletterSubscriptionServicesImpl.java 14 Oct 2008 11:22:44 -0000
1.27
+++ NewsletterSubscriptionServicesImpl.java 22 Oct 2008 10:07:47 -0000
1.28
@@ -242,7 +242,7 @@
}
public int countSubscriptionByNewsletter(int id) {
- return subscriptionCAO.getSubscription(id).size();
+ return subscriptionCAO.CountSubscription(id);
}
public List<Subscription> getAllSubscription() {
@@ -264,11 +264,11 @@
return subscriptionCAO.getSubscription(Integer.parseInt(newsletterId));
}
- public Set<Newsletter> getNewslettersBySubscription(int subscriberId,
String title, boolean paging) {
+ public Set<Newsletter> getNewslettersBySubscription(int subscriberId,
String title, boolean paging){
log.debug("Get Subscriptions of subscriberId" + subscriberId);
List<Newsletter> newsletters =
subscriptionCAO.getNewslettersByScription(subscriberId, title, paging);
Set<Newsletter> results = new HashSet<Newsletter>();
- for (Newsletter newsletter : newsletters) {
+ for(Newsletter newsletter: newsletters){
String status = subscriptionCAO.getSubscription(newsletter.getId(),
subscriberId).getStatus().toString();
newsletter.setStatus(status);
results.add(newsletter);
@@ -385,7 +385,7 @@
public Set<Long> getAuthenticationIdsByNewsletter(int newsletterId) {
List<Subscription> subscriptions =
subscriptionCAO.getSubscription(newsletterId);
Set<Long> subscriberIds = new HashSet<Long>();
- for (Subscription subscription : subscriptions) {
+ for(Subscription subscription: subscriptions){
subscriberIds.add(new
Long(Integer.parseInt(subscription.getSubscriberId())));
}
return subscriberIds;
@@ -394,7 +394,7 @@
public Set<Long> getAuthenticationIds() {
List<Node> subscriptions = subscriptionCAO.getAllSubscriptions();
Set<Long> subscriberIds = new HashSet<Long>();
- for (Node subscription : subscriptions) {
+ for(Node subscription: subscriptions){
subscriberIds.add(new Long(subscription.getIntValue("subscriber")));
}
return subscriberIds;
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
