From 82e632660e6ffa01b1e43606720f6ba466969fa3 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Wed, 20 May 2009 05:24:13 +0000 Subject: [PATCH] http://sourceforge.net/tracker/?func=detail&aid=2794217&group_id=176962&atid=879332 --- base/src/org/compiere/model/MSequence.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/base/src/org/compiere/model/MSequence.java b/base/src/org/compiere/model/MSequence.java index e96f758b13..4cb8e58828 100644 --- a/base/src/org/compiere/model/MSequence.java +++ b/base/src/org/compiere/model/MSequence.java @@ -64,6 +64,8 @@ public class MSequence extends X_AD_Sequence /** Log Level for Next ID Call */ private static final Level LOGLEVEL = Level.ALL; + private static final int QUERY_TIME_OUT = 10; + public static int getNextID (int AD_Client_ID, String TableName) { return getNextID(AD_Client_ID, TableName, null); @@ -129,7 +131,9 @@ public class MSequence extends X_AD_Sequence pstmt = conn.prepareStatement(selectSQL, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE); pstmt.setString(1, TableName); - // + // + if (!USE_PROCEDURE) + pstmt.setQueryTimeout(QUERY_TIME_OUT); rs = pstmt.executeQuery(); if (CLogMgt.isLevelFinest()) s_log.finest("AC=" + conn.getAutoCommit() + ", RO=" + conn.isReadOnly() @@ -285,6 +289,7 @@ public class MSequence extends X_AD_Sequence cstmt.setInt(1, AD_Sequence_ID); cstmt.setString(2, adempiereSys ? "Y" : "N"); cstmt.registerOutParameter(3, Types.INTEGER); + cstmt.setQueryTimeout(QUERY_TIME_OUT); cstmt.execute(); retValue = cstmt.getInt(3); } @@ -323,6 +328,7 @@ public class MSequence extends X_AD_Sequence cstmt.setInt(2, incrementNo); cstmt.setString(3, calendarYear); cstmt.registerOutParameter(4, Types.INTEGER); + cstmt.setQueryTimeout(QUERY_TIME_OUT); cstmt.execute(); retValue = cstmt.getInt(4); } catch (Exception e) { @@ -486,7 +492,9 @@ public class MSequence extends X_AD_Sequence if (isStartNewYear) pstmt.setString(3, calendarYear); - // + // + if (!USE_PROCEDURE) + pstmt.setQueryTimeout(QUERY_TIME_OUT); rs = pstmt.executeQuery(); // s_log.fine("AC=" + conn.getAutoCommit() + " -Iso=" + conn.getTransactionIsolation() // + " - Type=" + pstmt.getResultSetType() + " - Concur=" + pstmt.getResultSetConcurrency()); @@ -765,7 +773,9 @@ public class MSequence extends X_AD_Sequence if (isStartNewYear) pstmt.setString(2, calendarYear); - // + // + if (!USE_PROCEDURE) + pstmt.setQueryTimeout(QUERY_TIME_OUT); rs = pstmt.executeQuery(); // s_log.fine("AC=" + conn.getAutoCommit() + " -Iso=" + conn.getTransactionIsolation() // + " - Type=" + pstmt.getResultSetType() + " - Concur=" + pstmt.getResultSetConcurrency());