[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/repository/jdbc JdbcRepository.java, 1.3, 1.4

[Suresh <sur...@us...>]

Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/repository/jdbc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20831/framework/repository/jdbc

Modified Files:
	JdbcRepository.java 
Log Message:
no message

Index: JdbcRepository.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/repository/jdbc/JdbcRepository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JdbcRepository.java	12 Sep 2006 23:23:46 -0000	1.3
--- JdbcRepository.java	13 Sep 2006 04:49:47 -0000	1.4
***************
*** 23,32 ****
  import java.sql.Timestamp;
  import java.sql.Types;
- import java.util.ArrayList;
  import java.util.HashMap;
- import java.util.List;
  import java.util.Map;
  import org.apache.log4j.Logger;
- import org.jmonks.batchserver.framework.ErrorCode;
  import org.jmonks.batchserver.framework.JobStatistics;
  import org.jmonks.batchserver.framework.config.ConfigurationException;
--- 23,29 ----
***************
*** 67,76 ****
  public class JdbcRepository extends Repository
  {
      /**
       *  Map holds the jdbc configuration.
       */
      protected Map jdbcConfigMap=null;
- 
-     private static Logger logger=Logger.getLogger(JdbcRepository.class);
      
      /**
--- 64,73 ----
  public class JdbcRepository extends Repository
  {
+     private static Logger logger=Logger.getLogger(JdbcRepository.class);
+     
      /**
       *  Map holds the jdbc configuration.
       */
      protected Map jdbcConfigMap=null;
      
      /**
***************
*** 140,144 ****
  
      /**
!      * @see org.jmonks.batchserver.framework.repository Repository#sendDataToNextJob(String,String,Object)
       */    
      public boolean sendDataToNextJob(String dataIdentifier, String nextJobName, final Object data)
--- 137,141 ----
  
      /**
!      *  @see org.jmonks.batchserver.framework.repository Repository#sendDataToNextJob(String,String,Object)
       */    
      public boolean sendDataToNextJob(String dataIdentifier, String nextJobName, final Object data)
***************
*** 170,174 ****
                  insertStatement.setString(2, nextJobName);
                  insertStatement.setString(3, dataIdentifier);
!                 byte[] objectByteArray=this.getByteArrayFromObject(data);
                  insertStatement.setBinaryStream(4, new ByteArrayInputStream(objectByteArray), objectByteArray.length);
                  insertStatement.executeUpdate();
--- 167,171 ----
                  insertStatement.setString(2, nextJobName);
                  insertStatement.setString(3, dataIdentifier);
!                 byte[] objectByteArray=this.serializeObjectIntoByteArray(data);
                  insertStatement.setBinaryStream(4, new ByteArrayInputStream(objectByteArray), objectByteArray.length);
                  insertStatement.executeUpdate();
***************
*** 223,227 ****
                  {
                      InputStream inputStream=rs.getBinaryStream(1);
!                     data=getObjectFromByteArray(inputStream);
                  }
                  else
--- 220,224 ----
                  {
                      InputStream inputStream=rs.getBinaryStream(1);
!                     data=deserializeObjectFromInputStream(inputStream);
                  }
                  else
***************
*** 277,282 ****
                  else
                      statement.setNull(5,Types.VARCHAR);
!                 statement.setInt(6, statistics.getRecordsProcessed());
!                 statement.setInt(7, statistics.getMaxMemoryUsage());
                  statement.executeUpdate();
                  statement.close();
--- 274,279 ----
                  else
                      statement.setNull(5,Types.VARCHAR);
!                 statement.setLong(6, statistics.getRecordsProcessed());
!                 statement.setLong(7, statistics.getMaxMemoryUsage());
                  statement.executeUpdate();
                  statement.close();
***************
*** 364,368 ****
                  PreparedStatement insertStatement=connection.prepareStatement("insert into job_mgmt_mntr_info (job_name,job_info) values (?,?)");
                  insertStatement.setString(1, this.jobName);
!                 byte[] objectByteArray=this.getByteArrayFromObject(registrationInfo);
                  insertStatement.setBinaryStream(2, new ByteArrayInputStream(objectByteArray), objectByteArray.length);
                  insertStatement.executeUpdate();
--- 361,365 ----
                  PreparedStatement insertStatement=connection.prepareStatement("insert into job_mgmt_mntr_info (job_name,job_info) values (?,?)");
                  insertStatement.setString(1, this.jobName);
!                 byte[] objectByteArray=this.serializeObjectIntoByteArray(registrationInfo);
                  insertStatement.setBinaryStream(2, new ByteArrayInputStream(objectByteArray), objectByteArray.length);
                  insertStatement.executeUpdate();
***************
*** 395,399 ****
       *  @return Returns the serialized data as byte array.
       */
!     private byte[] getByteArrayFromObject(Object object)
      {
          try
--- 392,396 ----
       *  @return Returns the serialized data as byte array.
       */
!     protected byte[] serializeObjectIntoByteArray(Object object)
      {
          try
***************
*** 422,426 ****
       *  @return Returns the deserialized object.
       */    
!     private Object getObjectFromByteArray(InputStream inputStream)
      {
          try
--- 419,423 ----
       *  @return Returns the deserialized object.
       */    
!     protected Object deserializeObjectFromInputStream(InputStream inputStream)
      {
          try