Author: kostat
Date: 2005-12-14 03:20:54 -0500 (Wed, 14 Dec 2005)
New Revision: 54350

Modified:
   
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
   
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbPortResolver.cs
Log:
merge -r 54348:54349

Modified: 
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
===================================================================
--- 
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
        2005-12-14 08:14:06 UTC (rev 54349)
+++ 
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
        2005-12-14 08:20:54 UTC (rev 54350)
@@ -1,3 +1,7 @@
+2005-14-12 Konstantin Triger <[EMAIL PROTECTED]>
+
+       * DbPortResolver.cs: fix port resolution for unnamed instances.
+
 2005-27-11 Boris Kirzner <[EMAIL PROTECTED]>
        AbstractDBCommand.cs: TARGET_JVM fix. Proper handle of return value 
        parameter and corresponding user parameter.

Modified: 
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbPortResolver.cs
===================================================================
--- 
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbPortResolver.cs
        2005-12-14 08:14:06 UTC (rev 54349)
+++ 
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.ProviderBase.jvm/DbPortResolver.cs
        2005-12-14 08:20:54 UTC (rev 54350)
@@ -80,7 +80,7 @@
 
                                java.util.StringTokenizer st = new 
java.util.StringTokenizer(received, ";");
                                String prev = "";
-                               bool instanceReached = false;
+                               bool instanceReached = instanceName == null || 
instanceName.Length == 0;
                                while (st.hasMoreTokens())
                                {
                                        if (!instanceReached)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to