retry

Author: 7yyo

src/client/jTPCC.java

@@ -484,7 +484,7 @@ else if(newOrderWeightValue == 0 && paymentWeightValue == 0 && orderStatusWeight
 			 conn, dbType,
 			 transactionsPerTerminal, terminalWarehouseFixed,
 			 paymentWeightValue, orderStatusWeightValue,
-			 deliveryWeightValue, stockLevelWeightValue, numWarehouses, limPerMin_Terminal, this);
+			 deliveryWeightValue, stockLevelWeightValue, numWarehouses, limPerMin_Terminal, this, database, dbProps);
 
 			terminals[i] = terminal;
 			terminalNames[i] = terminalName;

src/client/jTPCCConnection.java

@@ -307,9 +307,7 @@ public void commit()
 	throws SQLException
     {
     	try {
-			if (dbConn != null && !dbConn.isClosed()) {
-				dbConn.commit();
-			}
+			dbConn.commit();
 		} catch(SQLException e) {
     		throw new CommitException();
 		}
@@ -318,8 +316,6 @@ public void commit()
     public void rollback()
 	throws SQLException
     {
-		if (dbConn != null && !dbConn.isClosed()) {
 			dbConn.rollback();
-		}
     }
 }

src/client/jTPCCTerminal.java

@@ -12,6 +12,7 @@
 import java.sql.*;
 import java.sql.Date;
 import java.util.*;
+import javax.naming.CommunicationException;
 import javax.swing.*;
 
 
@@ -45,12 +46,16 @@ public class jTPCCTerminal implements jTPCCConfig, Runnable
     jTPCCConnection     db = null;
     int                 dbType = 0;
 
+	private String database = "";
+	private Properties dbProps = null;
+
     public jTPCCTerminal
       (String terminalName, int terminalWarehouseID, int terminalDistrictID,
        Connection conn, int dbType,
        int numTransactions, boolean terminalWarehouseFixed,
        int paymentWeight, int orderStatusWeight,
-       int deliveryWeight, int stockLevelWeight, int numWarehouses, int limPerMin_Terminal, jTPCC parent) throws SQLException
+       int deliveryWeight, int stockLevelWeight, int numWarehouses, int limPerMin_Terminal, jTPCC parent,
+	   String database, Properties dbProp) throws SQLException
     {
 	this.terminalName = terminalName;
 	this.conn = conn;
@@ -75,6 +80,8 @@ public class jTPCCTerminal implements jTPCCConfig, Runnable
 	this.numWarehouses = numWarehouses;
 	this.newOrderCounter = 0;
 	this.limPerMin_Terminal = limPerMin_Terminal;
+	this.database = database;
+	this.dbProps = dbProp;
 
 	this.db = new jTPCCConnection(conn, dbType);
 
@@ -165,6 +172,15 @@ private void executeTransactions(int numTransactions)
 		{
 			continue;
 		}
+		catch (SQLException e ){
+			try {
+				Connection conn = DriverManager.getConnection(database, dbProps);
+				conn.setAutoCommit(false);
+				db = new jTPCCConnection(conn, dbType);
+			} catch (SQLException ex) {
+				throw new RuntimeException(ex);
+			}
+		}
 		catch (Exception e)
 		{
 		    log.fatal(e.getMessage());