Pārlūkot izejas kodu

Small bug fixes for TARGET_JVM.

svn path=/trunk/mcs/; revision=48621
Boris Kirzner 20 gadi atpakaļ
vecāks
revīzija
2b66b8c8f7

+ 4 - 0
mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog

@@ -1,3 +1,7 @@
+2005-21-08 Boris Kirzner <[email protected]>
+	* ReaderCache.cs: no not create guid if the value fetched is null.
+	* SqlClientStrings.resx: fixed CON_PORT key value.
+
 2005-18-08 Boris Kirzner <[email protected]>
 	* AbstractDBCommand.cs: 
 		- Using Java regex instead of .Net ones.

+ 3 - 1
mcs/class/System.Data/System.Data.ProviderBase.jvm/ReaderCache.cs

@@ -252,7 +252,9 @@ namespace System.Data.Common
 
 		protected override void FetchInternal(ResultSet rs, int columnIndex)
 		{
-			_g = new Guid(rs.getString(columnIndex));
+			string s = rs.getString(columnIndex);
+			if (s != null)
+				_g = new Guid();
 		}
 
 		public override object GetValue()

+ 1 - 1
mcs/class/System.Data/System.Data.ProviderBase.jvm/SqlClientStrings.resx

@@ -116,7 +116,7 @@
 		<value>user id,user,uid</value>
 	</data>
 	<data name="CON_PORT">
-		<value>1433</value>
+		<value>port</value>
 	</data>
 	<data name="SQL_CON_PORT">
 		<value>1433</value>