diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-09-19 20:00:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 20:00:05 +0200 |
| commit | 253cfe20e7450bc087506fd3d02a76140df5f9aa (patch) | |
| tree | 711f9efc77af230526f7c266ad773243cbb7d602 /vespaclient | |
| parent | 5d92db079b6faf80cc2dcfb150889d452c3ac265 (diff) | |
Revert "- Use C++11 for loops."
Diffstat (limited to 'vespaclient')
| -rw-r--r-- | vespaclient/src/vespa/vespaclient/vesparoute/application.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp b/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp index fe4600aea58..1a518b4c819 100644 --- a/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp +++ b/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp @@ -4,18 +4,16 @@ #include <vespa/document/config/config-documenttypes.h> #include <vespa/document/repo/documenttyperepo.h> +#include <vespa/document/util/stringutil.h> #include <vespa/documentapi/messagebus/documentprotocol.h> #include <vespa/messagebus/configagent.h> #include <vespa/messagebus/routing/routingtable.h> #include <vespa/messagebus/routing/routedirective.h> #include <vespa/messagebus/rpcmessagebus.h> -#include <vespa/messagebus/network/rpcsendv1.h> -#include <vespa/messagebus/network/rpcsendv2.h> #include <vespa/slobrok/sbmirror.h> #include <vespa/config/common/exceptions.h> #include <vespa/config/helper/configgetter.hpp> #include <vespa/vespalib/util/stringfmt.h> -#include <vespa/fnet/frt/supervisor.h> using config::ConfigGetter; using document::DocumenttypesConfig; @@ -530,8 +528,9 @@ Application::isService(FRT_Supervisor &frt, const std::string &spec) const FRT_StringValue *retList = req->GetReturn()->GetValue(2)._string_array._pt; for (uint32_t i = 0; i < numMethods; ++i) { - if (mbus::RPCSendV1::isCompatible(methods[i]._str,argList[i]._str, retList[i]._str) || - mbus::RPCSendV2::isCompatible(methods[i]._str,argList[i]._str, retList[i]._str)) { + if (strcmp(methods[i]._str, mbus::RPCSendV1::METHOD_NAME) == 0 && + strcmp(argList[i]._str, mbus::RPCSendV1::METHOD_PARAMS) == 0 && + strcmp(retList[i]._str, mbus::RPCSendV1::METHOD_RETURN) == 0) { ret = true; break; } |