[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERCoreBusinessLogic/Sources/er/corebusinesslogic ERCMailDelivery.java,1.4,1.5

[Bruno P. <pos...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERCoreBusinessLogic/Sources/er/corebusinesslogic
In directory sc8-pr-cvs1:/tmp/cvs-serv19083/ERCoreBusinessLogic/Sources/er/corebusinesslogic

Modified Files:
	ERCMailDelivery.java 
Log Message:
apparently WO5.2 doesn t allow to have nulls in the method, http version and url any more also if er.corebusinesslogic.ERCUseMailFacility is false throwing, it should be checked before

Index: ERCMailDelivery.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERCoreBusinessLogic/Sources/er/corebusinesslogic/ERCMailDelivery.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ERCMailDelivery.java	21 Nov 2002 02:26:01 -0000	1.4
--- ERCMailDelivery.java	27 Nov 2002 01:10:25 -0000	1.5
***************
*** 85,96 ****
                                       String message,
                                       EOEditingContext ec) {
!         ERCMailMessage mailMessage = (ERCMailMessage)ERCMailMessage.mailMessageClazz().createAndInsertObject(ec);
!         String safeTitle=title!=null ? ( title.length() > 200 ? title.substring(0,198) : title ) : null;
!         mailMessage.setTitle(safeTitle);
!         mailMessage.setFromAddress(from);
!         mailMessage.setToAddresses(commaSeparatedListFromArray(to));
!         mailMessage.setCcAddresses(commaSeparatedListFromArray(cc));
!         mailMessage.setBccAddresses(commaSeparatedListFromArray(bcc));
!         mailMessage.setText(message);
          return mailMessage;
      }
--- 85,104 ----
                                       String message,
                                       EOEditingContext ec) {
!         ERCMailMessage mailMessage = null;
!         boolean usesMail = ERXProperties.booleanForKey("er.corebusinesslogic.ERCUseMailFacility");
!         if(usesMail){
!             mailMessage = (ERCMailMessage)ERCMailMessage.mailMessageClazz().createAndInsertObject(ec);
!             String safeTitle=title!=null ? ( title.length() > 200 ? title.substring(0,198) : title ) : null;
!             mailMessage.setTitle(safeTitle);
!             mailMessage.setFromAddress(from);
!             mailMessage.setToAddresses(commaSeparatedListFromArray(to));
!             mailMessage.setCcAddresses(commaSeparatedListFromArray(cc));
!             mailMessage.setBccAddresses(commaSeparatedListFromArray(bcc));
!             mailMessage.setText(message);
!         }else{
!             throw new RuntimeException("The application doesn't use the ERCUseMailFacility."+
!                                        "You can either set er.corebusinesslogic.ERCUseMailFacility in your properties or better check for that property before trying to compose the email");
!         }
! 
          return mailMessage;
      }
***************
*** 180,184 ****
                                                   NSDictionary bindings,
                                                   EOEditingContext ec) {
!         WOContext context = new WOContext(new WORequest(null, null, null, null, null, null));
          WOComponent component = WOApplication.application().pageWithName(componentName, context);
          if (bindings != null && bindings.count() > 0)
--- 188,192 ----
                                                   NSDictionary bindings,
                                                   EOEditingContext ec) {
!         WOContext context = new WOContext(new WORequest("POST", "", "HTTP/1.1", null, null, null));
          WOComponent component = WOApplication.application().pageWithName(componentName, context);
          if (bindings != null && bindings.count() > 0)