TARGET_JVM fix. Throw exception if MSSQL port resolution failed.

svn path=/trunk/mcs/; revision=53102

diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/ChangeLog b/mcs/class/System.Data/System.Data.OleDb.jvm/ChangeLog
index 94a6f2851b71a6d703da25e98ff7e5513bda24ca..89190aca42b5c9d7a50130703b3b8944bc3dee87 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/ChangeLog
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/ChangeLog
@@ -1,3 +1,6 @@
+2005-16-11 Boris Kirzner <borisk@mainsoft.com>
+       * OleDbConnection.cs: Added override for CreateException().
+
 2005-11-07 Konstantin Triger <kostat@mainsoft.com>
 
        * OleDbConnection.cs: retrieve the StringManager from AppDomain

diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
index a2b1d5100628717f87a307e86e5bb8148c061b99..36242a233500fae1f956597b40ccdd10aa104619 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnection.cs
@@ -247,6 +247,11 @@ namespace System.Data.OleDb
                        return new OleDbException(e,this);              \r
                }\r
 \r
+               protected override SystemException CreateException(string message)\r
+               {\r
+                       return new OleDbException(message, null, this); \r
+               }\r
+\r
                public DataTable GetOleDbSchemaTable (Guid schema, object[] restrictions)\r
                {\r
                        DataTable schemaTable = new DataTable("Tables");\r

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs
index e63dade601d0f35adeac83972dc8bf26a7af6f56..4fd7a7914efeab7b496c20dd6b8eb84ce3ed5681 100644 (file)
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBConnection.cs
@@ -574,7 +574,9 @@ namespace System.Data.Common
                                                }\r
                                                // todo : what should we do if all the timeout spent on port resolution ?\r
                                                if ("-1".Equals(port)) {\r
-                                                       port = StringManager.GetString("SQL_CON_PORT", "1433"); //default port of MSSql Server 3167.\r
+                                                       string message = String.Format ("Unable to retrieve the port number for {0} using UDP on port 1434. Please see your network administrator to solve this problem or add the port number of your SQL server instance to your connection string (i.e. port=1681).",ServerName);\r
+                                                       Exception e = CreateException (message);\r
+                                                       throw e;\r
                                                }\r
                                                ConnectionStringHelper.AddValue(UserParameters,StringManager.GetStringArray("CON_PORT"),port);\r
                                                break;\r
@@ -705,6 +707,8 @@ namespace System.Data.Common
 \r
                protected abstract SystemException CreateException(SQLException e);\r
 \r
+               protected abstract SystemException CreateException(string message);\r
+\r
                public override void Close()\r
                {\r
                        try {\r

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog b/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
index 686f219afb7471eaf5e26d676a58dfbdfddfa4fc..d0570f85b40fb016cdfeea2fdf2b5744954ee749 100644 (file)
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
@@ -1,3 +1,7 @@
+2005-16-11 Boris Kirzner <borisk@mainsoft.com>
+       * AbstractDBConnection.cs: TARGET_JVM fix. Throw exception if MSSQL port
+       resolution failed.
+
 2005-14-11 Boris Kirzner <borisk@mainsoft.com>
        * AbstractDBCommand.cs: TARGET_JVM fix. Provider name can be in any case..
 

diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/ChangeLog b/mcs/class/System.Data/System.Data.SqlClient.jvm/ChangeLog
index 623991322a68644453f6f104d1cc5d4fc02acbd4..dcde2a0cef831a7203ac634a36d6b629c36085e8 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient.jvm/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/ChangeLog
@@ -1,3 +1,6 @@
+2005-16-11 Boris Kirzner <borisk@mainsoft.com>
+       * SqlConnection.cs: Added override for CreateException().
+
 2005-09-14 Boris Kirzner <borisk@mainsoft.com>
        * SqlConvert.cs: Fix SqlDbType to JDBC type convertion.
 

diff --git a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConnection.cs b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConnection.cs
index d754f0f558469af741d8ae086c0e1246d2432205..b4474830f8f4685b874abb00ff40a8beb175e38e 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConnection.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient.jvm/SqlConnection.cs
@@ -212,6 +212,11 @@ namespace System.Data.SqlClient
                        return new SqlException(e, this);               \r
                }\r
 \r
+               protected override SystemException CreateException(string message)
+               {\r
+                       return new SqlException(message, null, this);           \r
+               }\r
+\r
                private void OnSqlInfoMessage (SqlInfoMessageEventArgs value)
                {
                        if (InfoMessage != null) {