Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv7443
Modified Files:
Tag: b1_5
SubscriptionImportExportAction.java
Log Message:
CMSC-1110, Import newsletter subscription data gives stacktrace,add validate
Xsream Object
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-1110
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.2.1
retrieving revision 1.10.2.2
diff -u -b -r1.10.2.1 -r1.10.2.2
--- SubscriptionImportExportAction.java 29 Oct 2008 07:36:43 -0000 1.10.2.1
+++ SubscriptionImportExportAction.java 30 Oct 2008 09:11:03 -0000 1.10.2.2
@@ -4,6 +4,7 @@
import com.finalist.cmsc.services.community.person.Person;
import com.finalist.cmsc.services.community.person.PersonService;
import com.finalist.cmsc.services.community.security.AuthenticationService;
+import com.finalist.newsletter.domain.Newsletter;
import com.finalist.newsletter.domain.Subscription;
import com.finalist.newsletter.domain.Term;
import com.finalist.newsletter.services.CommunityModuleAdapter;
@@ -189,11 +190,20 @@
}
for (Subscription subscription : subscriptionList) {
- Person subscrier = subscription.getSubscriber();
- int sbId = subscrier.getId().intValue();
- int nId = subscription.getNewsletter().getId();
-
- if (null == subscriptionServices.getSubscription(sbId, nId)) {
+ Person subscrier = new Person();
+ Newsletter newsletter= new Newsletter();
+ int sbId=0;
+ int nId=0;
+ if (null!=subscription) {
+ subscrier = subscription.getSubscriber();
+ newsletter=subscription.getNewsletter();
+ if (null!=subscrier&&null!=newsletter) {
+ //there will be add method to extend
+ sbId = subscrier.getId().intValue();
+ nId = subscription.getNewsletter().getId();
+ }
+ }
+ if (subscriptionServices.isAbleSubscrip(sbId, nId)&&null ==
subscriptionServices.getSubscription(sbId, nId)) {
log.debug(String.format("try to import user %s's subscription of
%s which is not exist", sbId, nId));
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
