Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory james.mmbase.org:/tmp/cvs-serv1209
Modified Files:
ReferenceImportExportAction.java
Log Message:
CMSC-947, Improve the newletter import/export into a generic community
import/export,fix overwrite bug
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
See also: http://www.mmbase.org/jira/browse/CMSC-947
Index: ReferenceImportExportAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/ReferenceImportExportAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ReferenceImportExportAction.java 19 Sep 2008 07:59:31 -0000 1.2
+++ ReferenceImportExportAction.java 19 Sep 2008 08:08:11 -0000 1.3
@@ -5,6 +5,8 @@
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.ActionForm;
@@ -81,7 +83,7 @@
}
for (PersonExportImportVO importPerson : xpersons) {
Authentication
authentication=importPerson.getAuthentication();
- if(null ==
authentication||null==authentication.getUserId()||StringUtils.isWhitespace(authentication.getPassword())){
+ if(null ==
authentication||StringUtils.isWhitespace(authentication.getUserId())||StringUtils.isWhitespace(authentication.getPassword())){
continue;
}
personService.addRelationRecord(level, importPerson);
@@ -113,6 +115,4 @@
public static Log getLog() {
return log;
}
-
-
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
