You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2009/03/25 20:36:30 UTC

svn commit: r758419 - in /qpid/trunk/qpid/cpp/src/qpid: broker/Broker.cpp management/Manageable.cpp management/Manageable.h management/ManagementBroker.cpp

Author: shuston
Date: Wed Mar 25 19:36:21 2009
New Revision: 758419

URL: http://svn.apache.org/viewvc?rev=758419&view=rev
Log:
Revert r758359 STATUS_INVALID_PARAMETER changes; breaks build. Reopen QPID-1737

Modified:
    qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
    qpid/trunk/qpid/cpp/src/qpid/management/Manageable.cpp
    qpid/trunk/qpid/cpp/src/qpid/management/Manageable.h
    qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=758419&r1=758418&r2=758419&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Wed Mar 25 19:36:21 2009
@@ -386,7 +386,7 @@
 	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:

Modified: qpid/trunk/qpid/cpp/src/qpid/management/Manageable.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/Manageable.cpp?rev=758419&r1=758418&r2=758419&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/Manageable.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/Manageable.cpp Wed Mar 25 19:36:21 2009
@@ -33,7 +33,7 @@
     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";
     }

Modified: qpid/trunk/qpid/cpp/src/qpid/management/Manageable.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/Manageable.h?rev=758419&r1=758418&r2=758419&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/Manageable.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/Manageable.h Wed Mar 25 19:36:21 2009
@@ -43,7 +43,7 @@
     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;

Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp?rev=758419&r1=758418&r2=758419&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp Wed Mar 25 19:36:21 2009
@@ -512,8 +512,8 @@
     } 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 {



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org