merge -r 53523:53525

svn path=/branches/mainsoft/gh1.7/mcs/; revision=53526

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs
index eca10ae4eac693496bb0daf5b46fe3037c66358e..1d2ddfd91699e9fd2ce81e37f008d0d2c90c2784 100644 (file)
--- a/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase.jvm/AbstractDBCommand.cs
@@ -441,10 +441,15 @@ namespace System.Data.ProviderBase
                        if (trimedProcedureName.Length > 0 && trimedProcedureName[trimedProcedureName.Length-1] == ')')\r
                                addParas = false;\r
                        \r
-                               AbstractDbParameter derivedParam = (derivedParams.Count > 0) ? (AbstractDbParameter)derivedParams[curDerivedPos++] : null;\r
+                               AbstractDbParameter derivedParam = (derivedParams.Count > 0) ? (AbstractDbParameter)derivedParams[curDerivedPos] : null;\r
+                               if (derivedParam != null) {\r
+                                       if (derivedParam.Direction == ParameterDirection.ReturnValue)\r
+                                               curDerivedPos++;\r
+                                       else\r
+                                               derivedParam = null; //play as if there is no retval parameter\r
+                               }\r
                                AbstractDbParameter returnValueParameter = GetReturnParameter (userParams);\r
                                if (returnValueParameter != null) {\r
-\r
                                        curUserPos++;\r
                                        InternalParameters.Add(returnValueParameter);\r
                                        sb.Append("{? = call ");\r

diff --git a/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog b/mcs/class/System.Data/System.Data.ProviderBase.jvm/ChangeLog
index e5ab2047e4edf2c85fbebd66eca40275935703e2..de7a5b187433ee9e4903fbaef379a4f445a810d9 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-27-11 Boris Kirzner <borisk@mainsoft.com>
+       AbstractDBCommand.cs: TARGET_JVM fix. Proper handle of return value 
+       parameter and corresponding user parameter.
+
 2006-22-11 Konstantin Triger <kostat@mainsoft.com>
 
        * AbstractTransaction.cs: set inner exception.