Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv4972/forms
Modified Files:
Tag: b1_5
SubscriptionImportExportAction.java
Log Message:
CMSC-1107 Newsletter errors in log: JDBC begin failed
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1107
Index: SubscriptionImportExportAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptionImportExportAction.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -b -r1.10 -r1.10.2.1
--- SubscriptionImportExportAction.java 24 Sep 2008 09:56:25 -0000 1.10
+++ SubscriptionImportExportAction.java 29 Oct 2008 07:36:43 -0000 1.10.2.1
@@ -6,6 +6,7 @@
import com.finalist.cmsc.services.community.security.AuthenticationService;
import com.finalist.newsletter.domain.Subscription;
import com.finalist.newsletter.domain.Term;
+import com.finalist.newsletter.services.CommunityModuleAdapter;
import com.finalist.newsletter.services.NewsletterSubscriptionServices;
import com.finalist.newsletter.services.NewsletterService;
import com.finalist.cmsc.services.community.security.Authentication;
@@ -62,7 +63,12 @@
} else {
subscriptions = subscriptionServices.getAllSubscription();
}
-
+ for(Subscription subscription:subscriptions) {
+ String subscriberId = subscription.getSubscriberId();
+ if(StringUtils.isNotEmpty(subscriberId)) {
+
subscription.setSubscriber(CommunityModuleAdapter.getUserById(subscriberId));
+ }
+ }
String xml = getXStream().toXML(subscriptions);
byte[] bytes = xml.getBytes();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
