bugfixes for debian sid

Author: Peter Spiess-Knafl

doc/manpage

@@ -19,9 +19,9 @@ jsonrpcstub is a tool to generate C++ and JavaScript classes from a procedure sp
 .PP
 Generate C++ Stubs for Server and Client, the classes will be named AbstractStubServer and StubClient:
 .PP
-.Vb 1
+.B
 \&  	  jsonrpcstub  <spec.json> --cpp--server=AbstractStubServer<abstractserverstub.h> --cpp-client=StubClient
-.Ve
+.B
 .SH SEE ALSO
 https://github.com/cinemast/libjson\-rpc\-cpp
 .SH BUGS

src/jsonrpccpp/common/specificationparser.cpp

@@ -55,35 +55,37 @@ void                SpecificationParser::GetProcedure           (Json::Value &si
 {
     if (signature.isObject() && GetProcedureName(signature) != "")
     {
-        if (signature[KEY_SPEC_PROCEDURE_PARAMETERS].isObject() ||  signature[KEY_SPEC_PROCEDURE_PARAMETERS].isArray())
+        result.SetProcedureName(GetProcedureName(signature));
+        if (signature.isMember(KEY_SPEC_RETURN_TYPE))
         {
-            result.SetProcedureName(GetProcedureName(signature));
-            if (signature.isMember(KEY_SPEC_RETURN_TYPE))
+            result.SetProcedureType(RPC_METHOD);
+            result.SetReturnType(toJsonType(signature[KEY_SPEC_RETURN_TYPE]));
+        }
+        else
+        {
+            result.SetProcedureType(RPC_NOTIFICATION);
+        }
+        if (signature.isMember(KEY_SPEC_PROCEDURE_PARAMETERS))
+        {
+            if (signature[KEY_SPEC_PROCEDURE_PARAMETERS].isObject() ||  signature[KEY_SPEC_PROCEDURE_PARAMETERS].isArray())
             {
-                result.SetProcedureType(RPC_METHOD);
-                result.SetReturnType(toJsonType(signature[KEY_SPEC_RETURN_TYPE]));
+                if (signature[KEY_SPEC_PROCEDURE_PARAMETERS].isArray())
+                {
+                    result.SetParameterDeclarationType(PARAMS_BY_POSITION);
+                    GetPositionalParameters(signature, result);
+                }
+                else if (signature[KEY_SPEC_PROCEDURE_PARAMETERS].isObject())
+                {
+                    result.SetParameterDeclarationType(PARAMS_BY_NAME);
+                    GetNamedParameters(signature, result);
+                }
             }
             else
             {
-                result.SetProcedureType(RPC_NOTIFICATION);
+                throw JsonRpcException(Errors::ERROR_SERVER_PROCEDURE_SPECIFICATION_SYNTAX,
+                                       "Invalid signature types in fileds: "
+                                       + signature.toStyledString());
             }
-
-            if (signature.isMember(KEY_SPEC_PROCEDURE_PARAMETERS) && signature[KEY_SPEC_PROCEDURE_PARAMETERS].isArray())
-            {
-                result.SetParameterDeclarationType(PARAMS_BY_POSITION);
-                GetPositionalParameters(signature, result);
-            }
-            else if (signature.isMember(KEY_SPEC_PROCEDURE_PARAMETERS) && signature[KEY_SPEC_PROCEDURE_PARAMETERS].isObject())
-            {
-                result.SetParameterDeclarationType(PARAMS_BY_NAME);
-                GetNamedParameters(signature, result);
-            }
-        }
-        else
-        {
-            throw JsonRpcException(Errors::ERROR_SERVER_PROCEDURE_SPECIFICATION_SYNTAX,
-                                   "Invalid signature types in fileds: "
-                                   + signature.toStyledString());
         }
     }
     else

src/test/test_server.cpp

@@ -159,7 +159,7 @@ BOOST_FIXTURE_TEST_CASE(test_server_v2_method_error, F)
     BOOST_CHECK_EQUAL(c.GetJsonResponse().isMember("result"),false);
 
     //userspace exception
-    c.SetRequest("{\"jsonrpc\":\"2.0\", \"id\": 1, \"method\": \"exceptionMethod\",\"params\":null}");
+    c.SetRequest("{\"jsonrpc\":\"2.0\", \"id\": 1, \"method\": \"exceptionMethod\"}");
     BOOST_CHECK_EQUAL(c.GetJsonResponse()["error"]["code"], -32099);
     BOOST_CHECK_EQUAL(c.GetJsonResponse()["error"]["message"], "User exception");
     BOOST_CHECK_EQUAL(c.GetJsonResponse().isMember("result"),false);