fix ted bug 42700, throw the runtimeException when test connection.

4 files changed, 10 insertions, 2 deletions

diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.ui/src/org/eclipse/birt/report/data/oda/jdbc/ui/profile/JDBCSelectionPageHelper.java b/data/org.eclipse.birt.report.data.oda.jdbc.ui/src/org/eclipse/birt/report/data/oda/jdbc/ui/profile/JDBCSelectionPageHelper.java
index 749a46a..91fb3d8 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.ui/src/org/eclipse/birt/report/data/oda/jdbc/ui/profile/JDBCSelectionPageHelper.java
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.ui/src/org/eclipse/birt/report/data/oda/jdbc/ui/profile/JDBCSelectionPageHelper.java
@@ -589,7 +589,7 @@ public class JDBCSelectionPageHelper
 				{
 					ExceptionHandler.showException( getShell( ),
 							JdbcPlugin.getResourceString( "connection.test" ),//$NON-NLS-1$
-							JdbcPlugin.getResourceString( e1.getLocalizedMessage( ) ),
+							e1.getLocalizedMessage( ),
 							e1 );
 				}
 				testButton.setEnabled( true );
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/i18n/Messages.properties b/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/i18n/Messages.properties
index a24ab70..6f0b32d 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/i18n/Messages.properties
+++ b/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/i18n/Messages.properties
@@ -96,3 +96,4 @@ odajdbc.CannotInstantiateDriverClass=Cannot create instance of JDBC Driver class
 odajdbc.CannotInstantiateFactory=Cannot create instance of connection factory class "{0}" defined in the extension for driver class "{1}".
 
 odajdbc.jndi.InvalidJndiResource=Found JNDI resource type ({0}); expecting javax.sql.DataSource type.
+odajdbc.testfail=Test Fail
\ No newline at end of file
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/i18n/ResourceConstants.java b/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/i18n/ResourceConstants.java
index 01d807b..4cb1b96 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/i18n/ResourceConstants.java
+++ b/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/i18n/ResourceConstants.java
@@ -137,4 +137,5 @@ public class ResourceConstants
 	public final static String CANNOT_INSTANTIATE_FACTORY="odajdbc.CannotInstantiateFactory";
     
     public final static String JNDI_INVALID_RESOURCE="odajdbc.jndi.InvalidJndiResource";
+    public final static String TEST_CONNECTION_FAIL="odajdbc.testfail";
 }
\ No newline at end of file
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/JDBCDriverManager.java b/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/JDBCDriverManager.java
index 9b1f711..968fb0b 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/JDBCDriverManager.java
+++ b/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/JDBCDriverManager.java
@@ -668,7 +668,13 @@ public class JDBCDriverManager
 		}
 		catch ( SQLException e )
 		{
-			throw new JDBCException( e.getLocalizedMessage( ), null );
+			throw new JDBCException( ResourceConstants.TEST_CONNECTION_FAIL, e );
+		}
+		catch( RuntimeException e )
+		{
+			OdaException ex = new OdaException( e.getLocalizedMessage( ) );
+			ex.initCause( e );
+			throw ex;
 		}
 		// If the given url cannot be parsed.
 		if ( canConnect == false )