use Invariant culture for string manipulations

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

diff --git a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs
index dc34259b86f19b4914011dc200361c8c30c5cc03..6995c54c4a580a56f9137baf2a2c2179688f1975 100644 (file)
--- a/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs
+++ b/mcs/class/System.Data/Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs
@@ -37,6 +37,7 @@ using System.Data.ProviderBase;
 using Mainsoft.Data.Configuration;
 
 using java.net;
+using System.Globalization;
 
 namespace Mainsoft.Data.Jdbc.Providers
 {
@@ -130,7 +131,7 @@ namespace Mainsoft.Data.Jdbc.Providers
                                while (st.hasMoreTokens()) {
                                        if (!instanceReached) {
                                                if (prev.Trim().Equals("InstanceName")) {
-                                                       if (String.Compare(instanceName,st.nextToken().Trim(),true) == 0) {
+                                                       if (String.Compare(instanceName,st.nextToken().Trim(),true, CultureInfo.InvariantCulture) == 0) {
                                                                instanceReached = true;
                                                        }
                                                }
@@ -377,7 +378,7 @@ namespace Mainsoft.Data.Jdbc.Providers
                        if (dataSource != null && dataSource.StartsWith ("(") && dataSource.EndsWith (")"))                                     
                                dataSource = dataSource.Substring (1,dataSource.Length - 2);
 
-                       if (String.Empty.Equals (dataSource) || (String.Compare ("local",dataSource,true) == 0) || (String.CompareOrdinal(".", dataSource) == 0)) 
+                       if (String.Empty.Equals (dataSource) || (String.Compare ("local", dataSource, true, CultureInfo.InvariantCulture) == 0) || (String.CompareOrdinal (".", dataSource) == 0)) 
                                dataSource = "localhost";
 
                        return dataSource;

diff --git a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbParameter.cs b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbParameter.cs
index c86334d6f824af0db78893a3ef70928467e6e932..08fd46d2b38562dbf384a8414998bde98658e2e6 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbParameter.cs
+++ b/mcs/class/System.Data/System.Data.OleDb.jvm/OleDbParameter.cs
@@ -38,6 +38,7 @@ using System.Data.ProviderBase;
 \r
 using java.sql;\r
 using java.lang;\r
+using System.Globalization;\r
 \r
 namespace System.Data.OleDb\r
 {\r
@@ -207,19 +208,19 @@ namespace System.Data.OleDb
                        // FIXME : is that correct?\r
                        if (jdbcType == Types.OTHER) {\r
                                string typeName = res.getString("TYPE_NAME");\r
-                               if (String.Compare("BLOB",typeName,true) == 0) {\r
+                               if (String.Compare ("BLOB", typeName, true, CultureInfo.InvariantCulture) == 0) {\r
                                        jdbcType = Types.BLOB;\r
                                }\r
-                               else if (String.Compare("CLOB",typeName,true) == 0) {\r
+                               else if (String.Compare ("CLOB", typeName, true, CultureInfo.InvariantCulture) == 0) {\r
                                        jdbcType = Types.CLOB;\r
                                }\r
-                               else if(String.Compare("FLOAT",typeName,true) == 0) {\r
+                               else if (String.Compare ("FLOAT", typeName, true, CultureInfo.InvariantCulture) == 0) {\r
                                        jdbcType = Types.FLOAT;\r
                                }\r
-                               else if(String.Compare("NVARCHAR2",typeName,true) == 0) {\r
+                               else if (String.Compare ("NVARCHAR2", typeName, true, CultureInfo.InvariantCulture) == 0) {\r
                                        jdbcType = Types.VARCHAR;\r
                                }\r
-                               else if(String.Compare("NCHAR",typeName,true) == 0) {\r
+                               else if (String.Compare ("NCHAR", typeName, true, CultureInfo.InvariantCulture) == 0) {\r
                                        jdbcType = Types.VARCHAR;\r
                                }\r
                        }\r