You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2013/06/07 18:56:31 UTC
svn commit: r1490725 - in /zookeeper/bookkeeper/branches/branch-4.2:
CHANGES.txt hedwig-client/src/main/cpp/lib/subscriberimpl.cpp
Author: ivank
Date: Fri Jun 7 16:56:31 2013
New Revision: 1490725
URL: http://svn.apache.org/r1490725
Log:
BOOKKEEPER-598: Fails to compile - RESUBSCRIBE_EXCEPTION conflict (Matthew Farrellee via ivank)
Modified:
zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/subscriberimpl.cpp
Modified: zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt?rev=1490725&r1=1490724&r2=1490725&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt Fri Jun 7 16:56:31 2013
@@ -24,6 +24,10 @@ Release 4.2.2 - Unreleased
BOOKKEEPER-579: TestSubAfterCloseSub was put in a wrong package (sijie via ivank)
+ hedwig-client:
+
+ BOOKKEEPER-598: Fails to compile - RESUBSCRIBE_EXCEPTION conflict (Matthew Farrellee via ivank)
+
Release 4.2.1 - 2013-02-19
Backward compatible changes:
Modified: zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/subscriberimpl.cpp
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/subscriberimpl.cpp?rev=1490725&r1=1490724&r2=1490725&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/subscriberimpl.cpp (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/subscriberimpl.cpp Fri Jun 7 16:56:31 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