diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-03-25 19:36:21 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-03-25 19:36:21 +0000 |
| commit | f9921628f62c956cb6003105d7c01cb41aefccb9 (patch) | |
| tree | f25c0e8fc9425bcc0ad387abd82f246773104e6d | |
| parent | ed17fb88e7917782495cbca795eaf98878e48fe6 (diff) | |
| download | qpid-python-f9921628f62c956cb6003105d7c01cb41aefccb9.tar.gz | |
Revert r758359 STATUS_INVALID_PARAMETER changes; breaks build. Reopen QPID-1737
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@758419 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Broker.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/management/Manageable.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/management/Manageable.h | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/management/ManagementBroker.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp index c92799e17d..3f9effc08f 100644 --- a/qpid/cpp/src/qpid/broker/Broker.cpp +++ b/qpid/cpp/src/qpid/broker/Broker.cpp @@ -386,7 +386,7 @@ Manageable::status_t Broker::ManagementMethod (uint32_t methodId, if (queueMoveMessages(moveArgs.i_srcQueue, moveArgs.i_destQueue, moveArgs.i_qty)) status = Manageable::STATUS_OK; else - return Manageable::STATUS_PARAMETER_INVALID; + return Manageable::STATUS_INVALID_PARAMETER; break; } default: diff --git a/qpid/cpp/src/qpid/management/Manageable.cpp b/qpid/cpp/src/qpid/management/Manageable.cpp index 9ca408c821..08bb541fc7 100644 --- a/qpid/cpp/src/qpid/management/Manageable.cpp +++ b/qpid/cpp/src/qpid/management/Manageable.cpp @@ -33,7 +33,7 @@ string Manageable::StatusText (status_t status, string text) case STATUS_UNKNOWN_OBJECT : return "UnknownObject"; case STATUS_UNKNOWN_METHOD : return "UnknownMethod"; case STATUS_NOT_IMPLEMENTED : return "NotImplemented"; - case STATUS_PARAMETER_INVALID : return "InvalidParameter"; + case STATUS_INVALID_PARAMETER : return "InvalidParameter"; case STATUS_FEATURE_NOT_IMPLEMENTED : return "FeatureNotImplemented"; case STATUS_FORBIDDEN : return "Forbidden"; } diff --git a/qpid/cpp/src/qpid/management/Manageable.h b/qpid/cpp/src/qpid/management/Manageable.h index f17332528d..ededa6141e 100644 --- a/qpid/cpp/src/qpid/management/Manageable.h +++ b/qpid/cpp/src/qpid/management/Manageable.h @@ -43,7 +43,7 @@ class QPID_COMMON_EXTERN Manageable static const status_t STATUS_UNKNOWN_OBJECT = 1; static const status_t STATUS_UNKNOWN_METHOD = 2; static const status_t STATUS_NOT_IMPLEMENTED = 3; - static const status_t STATUS_PARAMETER_INVALID = 4; + static const status_t STATUS_INVALID_PARAMETER = 4; static const status_t STATUS_FEATURE_NOT_IMPLEMENTED = 5; static const status_t STATUS_FORBIDDEN = 6; static const status_t STATUS_EXCEPTION = 7; diff --git a/qpid/cpp/src/qpid/management/ManagementBroker.cpp b/qpid/cpp/src/qpid/management/ManagementBroker.cpp index 536b4cae4f..19300ef1af 100644 --- a/qpid/cpp/src/qpid/management/ManagementBroker.cpp +++ b/qpid/cpp/src/qpid/management/ManagementBroker.cpp @@ -512,8 +512,8 @@ void ManagementBroker::handleMethodRequestLH (Buffer& inBuffer, string replyToKe } else { if ((iter->second->getPackageName() != packageName) || (iter->second->getClassName() != className)) { - outBuffer.putLong (Manageable::STATUS_PARAMETER_INVALID); - outBuffer.putMediumString(Manageable::StatusText (Manageable::STATUS_PARAMETER_INVALID)); + outBuffer.putLong (Manageable::STATUS_INVALID_PARAMETER); + outBuffer.putMediumString(Manageable::StatusText (Manageable::STATUS_INVALID_PARAMETER)); } else try { |