QPID-3577: undo commit - qpidd.1 changes should not have been committed

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1196656 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 7 insertions, 23 deletions

diff --git a/qpid/cpp/docs/man/qpidd.1 b/qpid/cpp/docs/man/qpidd.1
index 7ffb153248..d2cff454cf 100644
--- a/qpid/cpp/docs/man/qpidd.1
+++ b/qpid/cpp/docs/man/qpidd.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.2.
-.TH QPIDD "1" "November 2011" "qpidd (qpidc) version 0.13" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.2.
+.TH QPIDD "1" "March 2011" "qpidd (qpidc) version 0.11" "User Commands"
 .SH NAME
 
 qpidd \- the Qpid AMQP Message Broker Daemon
@@ -24,11 +24,11 @@ Displays the help message
 \fB\-v\fR [ \fB\-\-version\fR ]
 Displays version information
 .TP
-\fB\-\-config\fR FILE (/usr/local/etc/qpidd.conf)
+\fB\-\-config\fR FILE
 Reads configuration from FILE
 .SS "Module options:"
 .TP
-\fB\-\-module\-dir\fR DIR (/usr/local/lib/qpid/daemon)
+\fB\-\-module\-dir\fR DIR
 Load all shareable modules in this
 directory
 .TP
@@ -41,7 +41,7 @@ Don't load modules from module
 directory
 .SS "Broker Options:"
 .TP
-\fB\-\-data\-dir\fR DIR (/home/kgiusti/.qpidd)
+\fB\-\-data\-dir\fR DIR
 Directory to contain persistent data
 generated by the broker
 .TP
@@ -127,15 +127,6 @@ which flow control is de\-activated.
 \fB\-\-default\-event\-threshold\-ratio\fR %age of limit (80)
 The ratio of any specified queue limit
 at which an event will be raised
-.TP
-\fB\-\-default\-message\-group\fR GROUP\-IDENTIFER (qpid.no\-group)
-Group identifier to assign to messages
-delivered to a message group queue that
-do not contain an identifier.
-.TP
-\fB\-\-enable\-timestamp\fR yes|no (0)
-Add current time to each received
-message.
 .SS "Logging options:"
 .TP
 \fB\-t\fR [ \fB\-\-trace\fR ]
@@ -173,10 +164,6 @@ Include thread ID in log messages
 Include function signature in log
 messages
 .TP
-\fB\-\-log\-hires\-timestamp\fR yes|no (0)
-Use unformatted hi\-res timestamp in log
-messages
-.TP
 \fB\-\-log\-prefix\fR STRING
 Prefix to append to all log messages
 .SS "Logging sink options:"
@@ -210,7 +197,7 @@ default in this mode.
 The transport for which to return the
 port
 .TP
-\fB\-\-pid\-dir\fR DIR (/home/kgiusti/.qpidd)
+\fB\-\-pid\-dir\fR DIR
 Directory where port\-specific PID file
 is stored
 .TP
diff --git a/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp b/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
index 00d1a58bef..77108c10d5 100644
--- a/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
@@ -77,15 +77,12 @@ MessageGroupManager::GroupState& MessageGroupManager::findGroup( const QueuedMes
     if (headers) {
         qpid::framing::FieldTable::ValuePtr id = headers->get( groupIdHeader );
         if (id && id->convertsTo<std::string>()) {
-            std::string tmp = id->get<std::string>();
-            if (!tmp.empty())   // empty group is reserved
-                group = tmp;
+            group = id->get<std::string>();
         }
     }
 
     if (cachedGroup && group == lastGroup) {
         hits++;
-        lastMsg = thisMsg;
         return *cachedGroup;
     }