[Tolven-cvs-commit] tolvenEJB/src/org/tolven/gen/bean GenDriver.java, 1.18.10.4, 1.18.10.5

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv26148/src/org/tolven/gen/bean

Modified Files:
      Tag: V2
	GenDriver.java 
Log Message:
When multiple messages are queued, they are all queued using one connection

Index: GenDriver.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/GenDriver.java,v
retrieving revision 1.18.10.4
retrieving revision 1.18.10.5
diff -C2 -d -r1.18.10.4 -r1.18.10.5
*** GenDriver.java	24 Dec 2010 01:13:32 -0000	1.18.10.4
--- GenDriver.java	17 Jan 2011 10:13:43 -0000	1.18.10.5
***************
*** 15,18 ****
--- 15,21 ----
  
  import java.io.ByteArrayOutputStream;
+ import java.io.Serializable;
+ import java.util.ArrayList;
+ import java.util.List;
  
  import javax.annotation.Resource;
***************
*** 95,98 ****
--- 98,102 ----
                  //TolvenLogger.info("MsgID: " + msg.getJMSMessageID() +  "  "+ control + " Principal:" + ctx.getCallerPrincipal().getName(), GenDriver.class);
                  int count = 0;
+                 List<Serializable> familyControls = new ArrayList<Serializable>();
                  while (count < control.getCount()) {
                      FamilyUnit family = familyGen.generateFamily(null, control.getNow());
***************
*** 103,109 ****
                      familyControl.setUserId(control.getUserId());
                      familyControl.setStartYear(control.getStartYear());
!                     generatorQueueBean.send(familyControl);
                      count = count + familyControl.getFamilyUnit().getMembers().size();
                  }
                  TolvenLogger.info("***Done generating families***", GenDriver.class);
                  return;
--- 107,114 ----
                      familyControl.setUserId(control.getUserId());
                      familyControl.setStartYear(control.getStartYear());
!                     familyControls.add(familyControl);
                      count = count + familyControl.getFamilyUnit().getMembers().size();
                  }
+                 generatorQueueBean.send(familyControls);
                  TolvenLogger.info("***Done generating families***", GenDriver.class);
                  return;
***************
*** 136,139 ****
--- 141,145 ----
                  String baseSeq = "" + control.getNow().getTime();
                  int seq = 0;
+                 List<TolvenMessage> tms = new ArrayList<TolvenMessage>();
                  for (FamilyMember member : control.getFamilyUnit().getMembers()) {
                      generator.setVp(member.getPerson());
***************
*** 151,157 ****
                      xmlBean.marshalCCR(ccr, output);
                      accountProcessingProctectionLocal.setAsEncryptedContent(output.toByteArray(), tm);
!                     tmSchedulerBean.queue(tm);
                      //                  TolvenLogger.info(tm.getPayload());
                  }
                  TolvenLogger.info("Finished generating: " + control, GenDriver.class);
              }
--- 157,166 ----
                      xmlBean.marshalCCR(ccr, output);
                      accountProcessingProctectionLocal.setAsEncryptedContent(output.toByteArray(), tm);
!                     tms.add(tm);
                      //                  TolvenLogger.info(tm.getPayload());
                  }
+                 if(!tms.isEmpty()) {
+                     tmSchedulerBean.queue(tms);
+                 }
                  TolvenLogger.info("Finished generating: " + control, GenDriver.class);
              }