You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2014/04/28 16:50:00 UTC

[1/2] git commit: https://issues.apache.org/jira/browse/AMQCPP-540

Repository: activemq-cpp
Updated Branches:
  refs/heads/trunk 5e8efc442 -> 91f5566f0


https://issues.apache.org/jira/browse/AMQCPP-540

Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/873b9d80
Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/873b9d80
Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/873b9d80

Branch: refs/heads/trunk
Commit: 873b9d803cd1ca90cd8b9a3bf2621bd45fdcadc6
Parents: 5e8efc4
Author: Timothy Bish <ta...@gmai.com>
Authored: Mon Apr 28 10:47:38 2014 -0400
Committer: Timothy Bish <ta...@gmai.com>
Committed: Mon Apr 28 10:47:38 2014 -0400

----------------------------------------------------------------------
 .../main/activemq/transport/discovery/AbstractDiscoveryAgent.cpp  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/873b9d80/activemq-cpp/src/main/activemq/transport/discovery/AbstractDiscoveryAgent.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/transport/discovery/AbstractDiscoveryAgent.cpp b/activemq-cpp/src/main/activemq/transport/discovery/AbstractDiscoveryAgent.cpp
index ed3a57f..48f2574 100644
--- a/activemq-cpp/src/main/activemq/transport/discovery/AbstractDiscoveryAgent.cpp
+++ b/activemq-cpp/src/main/activemq/transport/discovery/AbstractDiscoveryAgent.cpp
@@ -188,8 +188,7 @@ namespace discovery {
                     service->setFailed(true);
                     service->setFailureCount(service->getFailureCount() + 1);
 
-                    long
-                    reconnectDelay = 0;
+                    long long reconnectDelay = 0;
                     if (!useExponentialBackOff) {
                         reconnectDelay = initialReconnectDelay;
                     } else {


[2/2] git commit: https://issues.apache.org/jira/browse/AMQCPP-539

Posted by ta...@apache.org.
https://issues.apache.org/jira/browse/AMQCPP-539

Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/91f5566f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/91f5566f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/91f5566f

Branch: refs/heads/trunk
Commit: 91f5566f0d63db764d78f185a77c390f7a9b058d
Parents: 873b9d8
Author: Timothy Bish <ta...@gmai.com>
Authored: Mon Apr 28 10:49:27 2014 -0400
Committer: Timothy Bish <ta...@gmai.com>
Committed: Mon Apr 28 10:49:27 2014 -0400

----------------------------------------------------------------------
 .../src/main/decaf/internal/util/concurrent/windows/PlatformDefs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/91f5566f/activemq-cpp/src/main/decaf/internal/util/concurrent/windows/PlatformDefs.h
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/decaf/internal/util/concurrent/windows/PlatformDefs.h b/activemq-cpp/src/main/decaf/internal/util/concurrent/windows/PlatformDefs.h
index b443aa5..fffabe5 100644
--- a/activemq-cpp/src/main/decaf/internal/util/concurrent/windows/PlatformDefs.h
+++ b/activemq-cpp/src/main/decaf/internal/util/concurrent/windows/PlatformDefs.h
@@ -57,7 +57,7 @@ namespace concurrent{
 
     #define PLATFORM_THREAD_RETURN() return 0;
     #define PLATFORM_THREAD_CALLBACK_TYPE unsigned
-    #define PLATFORM_DEFAULT_STACK_SIZE 0x20000
+    #define PLATFORM_MIN_STACK_SIZE 0x20000
     #define PLATFORM_CALLING_CONV __stdcall
 
     typedef HANDLE decaf_thread_t;