Author: sijie
Date: Sun Apr 7 18:11:21 2013
New Revision: 1465438
URL: http://svn.apache.org/r1465438
Log:
BOOKKEEPER-598: Fails to compile - RESUBSCRIBE_EXCEPTION conflict (Matthew Farrellee via sijie)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/subscriberimpl.cpp
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1465438&r1=1465437&r2=1465438&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Sun Apr 7 18:11:21 2013
@@ -44,6 +44,10 @@ Trunk (unreleased changes)
BOOKKEEPER-599: NPE in PerChannelBookieClient (jiannan via sijie)
+ hedwig-client:
+
+ BOOKKEEPER-598: Fails to compile - RESUBSCRIBE_EXCEPTION conflict (Matthew Farrellee
via sijie)
+
IMPROVEMENTS:
BOOKKEEPER-555: Make BookieServer use Netty rather than a custom IO server (ivank)
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/subscriberimpl.cpp
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/subscriberimpl.cpp?rev=1465438&r1=1465437&r2=1465438&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/subscriberimpl.cpp (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/subscriberimpl.cpp Sun Apr
7 18:11:21 2013
@@ -39,7 +39,7 @@ const int DEFAULT_RECONNECT_SUBSCRIBE_RE
const bool DEFAULT_SUBSCRIBER_AUTOCONSUME = true;
const int DEFAULT_SUBSCRIPTION_MESSAGE_BOUND = 0;
-static const std::type_info& RESUBSCRIBE_EXCEPTION = typeid(ResubscribeException());
+static const std::type_info& RESUBSCRIBE_EXCEPTION_TYPEID = typeid(ResubscribeException());
ConsumeWriteCallback::ConsumeWriteCallback(const ActiveSubscriberPtr& activeSubscriber,
const PubSubDataPtr& data,
@@ -147,7 +147,7 @@ void ResubscribeCallback::operationCompl
}
void ResubscribeCallback::operationFailed(const std::exception& exception) {
- if (RESUBSCRIBE_EXCEPTION == typeid(exception)) {
+ if (RESUBSCRIBE_EXCEPTION_TYPEID == typeid(exception)) {
// it might be caused by closesub when resubscribing.
// so we don't need to retry resubscribe again
LOG4CXX_WARN(logger, "Failed to resubscribe " << *activeSubscriber
|