fix omitted parms issue

Martin Daetz · Martin Daetz · commit a4e89915a37d · 2015-02-05T18:15:40.000+01:00
diff --git a/AustinHarris.JsonRpcTest/UnitTest1.cs b/AustinHarris.JsonRpcTest/UnitTest1.cs
@@ -1345,5 +1345,17 @@ public void TestBatchResult()
 
             Assert.IsFalse(result.Result.EndsWith(@",]"), "result.Result.EndsWith(@',]')");
         }
+
+        [TestMethod]
+        public void TestLeftOutParams()
+        {
+            var request =
+                @"{""jsonrpc"":""2.0"",""method"":""ReturnsDateTime"",""id"":1}";
+
+            var result = JsonRpcProcessor.Process(request);
+            result.Wait();
+
+            Assert.IsFalse(result.Result.Contains(@"error"":{""code"":-32602"), @"According to JSON-RPC 2.0 the ""params"" member MAY be omitted.");
+        }
     }
 }
diff --git a/Json-Rpc/Handler.cs b/Json-Rpc/Handler.cs
@@ -200,16 +200,6 @@ public JsonResponse Handle(JsonRequest Rpc, Object RpcContext = null)
             {
                 return new JsonResponse() { Result = null, Error = new JsonRpcException(-32601, "Method not found", "The method does not exist / is not available."), Id = Rpc.Id };
             }
-            if (Rpc.Params is ICollection == false)
-            {
-                return new JsonResponse()
-                {
-                    Result = null,
-                    Error = new JsonRpcException(-32602,
-                        "Invalid params", "The number of parameters could not be counted"),
-                    Id = Rpc.Id
-                };
-            }
 
             bool isJObject = Rpc.Params is Newtonsoft.Json.Linq.JObject;
             bool isJArray = Rpc.Params is Newtonsoft.Json.Linq.JArray;
@@ -218,7 +208,13 @@ public JsonResponse Handle(JsonRequest Rpc, Object RpcContext = null)
             var metaDataParamCount = metadata.parameters.Count(x => x != null);
             
             var getCount = Rpc.Params as ICollection;
-            var loopCt = getCount.Count;
+            var loopCt = 0;
+            
+            if (getCount != null)
+            {
+                loopCt = getCount.Count;
+            }
+
             var paramCount = loopCt;
             if (paramCount == metaDataParamCount - 1 && metadata.parameters[metaDataParamCount-1].ObjectType.Name.Contains(typeof(JsonRpcException).Name))
             {

Original file line number	Diff line number	Diff line change
`@@ -1345,5 +1345,17 @@ public void TestBatchResult()`
`1345`	`1345`
`1346`	`1346`	`Assert.IsFalse(result.Result.EndsWith(@",]"), "result.Result.EndsWith(@',]')");`
`1347`	`1347`	`}`
	`1348`	`+`
	`1349`	`+ [TestMethod]`
	`1350`	`+ public void TestLeftOutParams()`
	`1351`	`+ {`
	`1352`	`+ var request =`
	`1353`	`+ @"{""jsonrpc"":""2.0"",""method"":""ReturnsDateTime"",""id"":1}";`
	`1354`	`+`
	`1355`	`+ var result = JsonRpcProcessor.Process(request);`
	`1356`	`+ result.Wait();`
	`1357`	`+`
	`1358`	`+ Assert.IsFalse(result.Result.Contains(@"error"":{""code"":-32602"), @"According to JSON-RPC 2.0 the ""params"" member MAY be omitted.");`
	`1359`	`+ }`
`1348`	`1360`	`}`
`1349`	`1361`	`}`