[teiid-commits] teiid SVN: r2572 - in branches/7.1.x: connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2010-09-14 14:55:50 -0400 (Tue, 14 Sep 2010)
New Revision: 2572

Modified:
   branches/7.1.x/api/src/main/java/org/teiid/translator/TranslatorException.java
   branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionException.java
   branches/7.1.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties
Log:
TEIID-1259 minor change to error message

Modified: branches/7.1.x/api/src/main/java/org/teiid/translator/TranslatorException.java
===================================================================
--- branches/7.1.x/api/src/main/java/org/teiid/translator/TranslatorException.java	2010-09-14 18:32:18 UTC (rev 2571)
+++ branches/7.1.x/api/src/main/java/org/teiid/translator/TranslatorException.java	2010-09-14 18:55:50 UTC (rev 2572)
@@ -49,13 +49,16 @@
     }
     
     public TranslatorException( String errorCode, String message ) {
-        super( message, errorCode);
+        super( errorCode, message);
     }
     
     public TranslatorException( int errorCode, String message ) {
         super(message, Integer.toString(errorCode));
-    }    
+    } 
     
+    public TranslatorException(Throwable e, int errorCode, String message ) {
+        super(e, Integer.toString(errorCode), message);
+    }
 
     /**
      * Construct an instance from a message and an exception to chain to this one.

Modified: branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionException.java
===================================================================
--- branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionException.java	2010-09-14 18:32:18 UTC (rev 2571)
+++ branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionException.java	2010-09-14 18:55:50 UTC (rev 2572)
@@ -34,7 +34,7 @@
 
 	public JDBCExecutionException(SQLException error,
 			TranslatedCommand... commands) {
-		super(error.getErrorCode(), commands == null ? error.getMessage() : JDBCPlugin.Util.getString("JDBCQueryExecution.Error_executing_query__1", //$NON-NLS-1$
+		super(error, error.getErrorCode(), commands == null || commands.length == 0 ? error.getMessage() : JDBCPlugin.Util.getString("JDBCQueryExecution.Error_executing_query__1", //$NON-NLS-1$
 						error.getMessage(), Arrays.toString(commands)));
 	}
 }

Modified: branches/7.1.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties
===================================================================
--- branches/7.1.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties	2010-09-14 18:32:18 UTC (rev 2571)
+++ branches/7.1.x/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties	2010-09-14 18:55:50 UTC (rev 2572)
@@ -25,7 +25,7 @@
 
 
 
-JDBCQueryExecution.Error_executing_query__1 = {0}\n\nExecuting statement:\n\n  {1}
+JDBCQueryExecution.Error_executing_query__1 = ''{0}'' error executing statement(s): {1}
 
 
 ConnectionListener.failed_to_report_jdbc_connection_details=Failed to report the JDBC driver and connection information