From 1138622ba88f56d919c8a010c97a4f154ed1aca0 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Mon, 15 Jan 2007 08:33:17 +0000
Subject: [PATCH] * Fixed concurrency issue of having retVars as instance
 variable

---
 .../compiere/dbPort/Convert_PostgreSQL.java   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java
index b7df9455b7..cb24bc0c0e 100644
--- a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java
+++ b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java
@@ -45,8 +45,7 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
 	/** Logger */
 	private static CLogger log = CLogger.getCLogger(Convert_PostgreSQL.class);
 
-	/** Vector to save previous values of quoted strings **/
-	private Vector<String> retVars = new Vector<String>();
+	
 	
 	/**
 	 * Is Oracle DB
@@ -69,9 +68,18 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
 
 		// remove comments
 		String statement = sqlStatement;
-		statement = replaceQuotedStrings(statement);
-		statement = convertMapStatement(removeComments(statement));
-		statement = recoverQuotedStrings(statement);
+		/** Vector to save previous values of quoted strings **/
+		Vector<String> retVars = new Vector<String>();
+		try 
+		{
+			statement = replaceQuotedStrings(statement,retVars);
+			statement = convertMapStatement(removeComments(statement));
+			statement = recoverQuotedStrings(statement,retVars);
+		}
+		catch (RuntimeException e) {
+			System.err.println(sqlStatement);
+			throw e;
+		}
 		// log.info("------------------------------------------------------------");
 		// log.info(statement);
 		// log.info("------------------->");
@@ -163,7 +171,7 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
 		return retValue;
 	} // convertSimpleStatement
 
-	private String replaceQuotedStrings(String retValue) {
+	private String replaceQuotedStrings(String retValue, Vector<String>retVars) {
 		// save every value  
 		// Pattern p = Pattern.compile("'[[\\w]*[-:,\\(\\)]*[ ]*]*'");
 		// Carlos Ruiz - globalqss - better matching regexp
@@ -177,7 +185,7 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
 		return retValue;
 	}
 
-	private String recoverQuotedStrings(String retValue) {
+	private String recoverQuotedStrings(String retValue, Vector<String>retVars) {
 		Pattern p = Pattern.compile("<-->", REGEX_FLAGS);
 		Matcher m = p.matcher(retValue);
 		for (int cont = 0; cont < retVars.size(); cont++) {