Author: kmorin Date: 2015-01-08 14:38:42 +0000 (Thu, 08 Jan 2015) New Revision: 744 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/744 Log: fix NPE on manual creation Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java 2015-01-08 10:41:35 UTC (rev 743) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java 2015-01-08 14:38:42 UTC (rev 744) @@ -24,23 +24,12 @@ * #L% */ -import static org.nuiton.i18n.I18n.t; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - +import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import org.apache.commons.lang3.StringUtils; -import org.nuiton.topia.persistence.TopiaEntities; -import org.nuiton.util.beans.BeanMonitor; - -import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailImpl; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.Reply; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; @@ -51,7 +40,16 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; import com.google.common.collect.Maps; +import org.apache.commons.lang3.StringUtils; +import org.nuiton.topia.persistence.TopiaEntities; +import org.nuiton.util.beans.BeanMonitor; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; + +import static org.nuiton.i18n.I18n.t; + /** * @author Kevin Morin (Code Lutin) * @@ -123,6 +121,10 @@ } Email email = model.toEntity(persistedEmail); + if (email.getOriginalEmail() == null) { + email.setOriginalEmail(model.getOriginalEmail()); + } + Collection<Attachment> attachments = model.getAttachment(); Collection<Reply> replies = model.getReplies(); String clientCode = model.getClientCode();