[2/6] qpid-proton git commit: NO-JIRA: [C++ binding] Add error_loop to fwd.hpp

2017-02-09 Thread astitcher 
NO-JIRA: [C++ binding] Add error_loop to fwd.hpp


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/9de1cc1a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/9de1cc1a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/9de1cc1a

Branch: refs/heads/master
Commit: 9de1cc1ae6867ceb9d0bec5f84f06ec7b77ee05f
Parents: 5bce0dc
Author: Andrew Stitcher 
Authored: Mon Feb 6 17:00:09 2017 -0500
Committer: Andrew Stitcher 
Committed: Wed Feb 8 14:39:21 2017 -0500

--
 proton-c/bindings/cpp/include/proton/fwd.hpp | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9de1cc1a/proton-c/bindings/cpp/include/proton/fwd.hpp
--
diff --git a/proton-c/bindings/cpp/include/proton/fwd.hpp 
b/proton-c/bindings/cpp/include/proton/fwd.hpp
index 3ed9283..54d7646 100644
--- a/proton-c/bindings/cpp/include/proton/fwd.hpp
+++ b/proton-c/bindings/cpp/include/proton/fwd.hpp
@@ -31,6 +31,7 @@ class container;
 class delivery;
 class error_condition;
 class event;
+class event_loop;
 class message;
 class message_id;
 class messaging_handler;


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[5/6] qpid-proton git commit: PROTON-1401: Change pn_handle_t type for more correct constness [ABI change]

2017-02-09 Thread astitcher 
PROTON-1401: Change pn_handle_t type for more correct constness [ABI change]


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/431696d2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/431696d2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/431696d2

Branch: refs/heads/master
Commit: 431696d22df9923543406af6f082afcef9cdd923
Parents: a96bccb
Author: Andrew Stitcher 
Authored: Tue Feb 7 12:29:25 2017 -0500
Committer: Andrew Stitcher 
Committed: Thu Feb 9 21:31:41 2017 -0500

--
 proton-c/bindings/cpp/include/proton/internal/data.hpp | 6 +++---
 proton-c/bindings/cpp/src/data.cpp | 4 ++--
 proton-c/include/proton/object.h   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/431696d2/proton-c/bindings/cpp/include/proton/internal/data.hpp
--
diff --git a/proton-c/bindings/cpp/include/proton/internal/data.hpp 
b/proton-c/bindings/cpp/include/proton/internal/data.hpp
index bfc0e33..0e35486 100644
--- a/proton-c/bindings/cpp/include/proton/internal/data.hpp
+++ b/proton-c/bindings/cpp/include/proton/internal/data.hpp
@@ -65,8 +65,8 @@ class data : public object {
 PN_CPP_EXTERN int appendn(data src, int limit);
 
 PN_CPP_EXTERN bool next();
-PN_CPP_EXTERN void* point() const;
-PN_CPP_EXTERN void restore(void* h);
+PN_CPP_EXTERN const void* point() const;
+PN_CPP_EXTERN void restore(const void* h);
 
   protected:
 void narrow();
@@ -85,7 +85,7 @@ class data : public object {
 struct state_guard {
 /// @cond INTERNAL
 data& data_;
-void* point_;
+const void* point_;
 bool cancel_;
 /// @endcond
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/431696d2/proton-c/bindings/cpp/src/data.cpp
--
diff --git a/proton-c/bindings/cpp/src/data.cpp 
b/proton-c/bindings/cpp/src/data.cpp
index 0f6e7f5..a8ebbec 100644
--- a/proton-c/bindings/cpp/src/data.cpp
+++ b/proton-c/bindings/cpp/src/data.cpp
@@ -46,9 +46,9 @@ void data::rewind() { ::pn_data_rewind(pn_object()); }
 
 bool data::empty() const { return ::pn_data_size(pn_object()) == 0; }
 
-void* data::point() const { return pn_data_point(pn_object()); }
+const void* data::point() const { return pn_data_point(pn_object()); }
 
-void data::restore(void* h) { pn_data_restore(pn_object(), pn_handle_t(h)); }
+void data::restore(const void* h) { pn_data_restore(pn_object(), 
pn_handle_t(h)); }
 
 void data::narrow() { pn_data_narrow(pn_object()); }
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/431696d2/proton-c/include/proton/object.h
--
diff --git a/proton-c/include/proton/object.h b/proton-c/include/proton/object.h
index e7efd94..bbd7de0 100644
--- a/proton-c/include/proton/object.h
+++ b/proton-c/include/proton/object.h
@@ -37,7 +37,7 @@ extern "C" {
  * @cond INTERNAL
  */
 
-typedef void* pn_handle_t;
+typedef const void* pn_handle_t;
 typedef intptr_t pn_shandle_t;
 
 typedef struct pn_class_t pn_class_t;


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[6/6] qpid-proton git commit: PROTON-1402: Simplify access to connection_context

2017-02-09 Thread astitcher 
PROTON-1402: Simplify access to connection_context


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/b9a57e8a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/b9a57e8a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/b9a57e8a

Branch: refs/heads/master
Commit: b9a57e8a78c547bc1d01506ecb636b50dc4ee8d6
Parents: 431696d
Author: Andrew Stitcher 
Authored: Wed Feb 8 13:26:15 2017 -0500
Committer: Andrew Stitcher 
Committed: Thu Feb 9 21:56:41 2017 -0500

--
 proton-c/bindings/cpp/src/connection_options.cpp   | 4 ++--
 proton-c/bindings/cpp/src/container_impl.cpp   | 4 ++--
 proton-c/bindings/cpp/src/contexts.cpp | 4 
 proton-c/bindings/cpp/src/include/contexts.hpp | 2 --
 proton-c/bindings/cpp/src/io/connection_driver.cpp | 4 ++--
 proton-c/bindings/cpp/src/io/link_namer.cpp| 3 ++-
 proton-c/bindings/cpp/src/session.cpp  | 2 +-
 7 files changed, 9 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b9a57e8a/proton-c/bindings/cpp/src/connection_options.cpp
--
diff --git a/proton-c/bindings/cpp/src/connection_options.cpp 
b/proton-c/bindings/cpp/src/connection_options.cpp
index c30b98d..506e84e 100644
--- a/proton-c/bindings/cpp/src/connection_options.cpp
+++ b/proton-c/bindings/cpp/src/connection_options.cpp
@@ -75,7 +75,7 @@ class connection_options::impl {
 void apply_unbound(connection& c) {
 pn_connection_t *pnc = unwrap(c);
 container::impl::connector *outbound = 
dynamic_cast(
-connection_context::get(c).handler.get());
+connection_context::get(unwrap(c)).handler.get());
 
 // Only apply connection options if uninit.
 bool uninit = c.uninitialized();
@@ -98,7 +98,7 @@ class connection_options::impl {
 // and if there is a pipelined open frame.
 pn_connection_t *pnc = unwrap(c);
 container::impl::connector *outbound = 
dynamic_cast(
-connection_context::get(c).handler.get());
+connection_context::get(unwrap(c)).handler.get());
 
 pn_transport_t *pnt = pn_connection_transport(pnc);
 if (!pnt) return;

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b9a57e8a/proton-c/bindings/cpp/src/container_impl.cpp
--
diff --git a/proton-c/bindings/cpp/src/container_impl.cpp 
b/proton-c/bindings/cpp/src/container_impl.cpp
index 9cec831..d58fc09 100644
--- a/proton-c/bindings/cpp/src/container_impl.cpp
+++ b/proton-c/bindings/cpp/src/container_impl.cpp
@@ -190,7 +190,7 @@ returned container::impl::connect(const 
std::string , const c
 proton::url  url(urlstr);
 connection conn(reactor_.connection_to_host(url.host(), url.port(), 
chandler.get()));
 internal::pn_unique_ptr ctor(new connector(conn, opts, url));
-connection_context& cc(connection_context::get(conn));
+connection_context& cc(connection_context::get(unwrap(conn)));
 cc.handler.reset(ctor.release());
 cc.event_loop_ = new event_loop::impl;
 
@@ -344,7 +344,7 @@ void 
container::impl::configure_server_connection(connection ) {
 pn_record_t *record = pn_connection_attachments(unwrap(c));
 pn_record_set_handler(record, chandler.get());
 }
-connection_context::get(c).event_loop_ = new event_loop::impl;
+connection_context::get(unwrap(c)).event_loop_ = new event_loop::impl;
 }
 
 void container::impl::run() {

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b9a57e8a/proton-c/bindings/cpp/src/contexts.cpp
--
diff --git a/proton-c/bindings/cpp/src/contexts.cpp 
b/proton-c/bindings/cpp/src/contexts.cpp
index 231506f..8da8f7c 100644
--- a/proton-c/bindings/cpp/src/contexts.cpp
+++ b/proton-c/bindings/cpp/src/contexts.cpp
@@ -77,10 +77,6 @@ context::id connection_context::id(pn_connection_t* c) {
 return context::id(pn_connection_attachments(c), CONNECTION_CONTEXT);
 }
 
-context::id connection_context::id(const connection& c) {
-return id(unwrap(c));
-}
-
 void container_context::set(const reactor& r, container& c) {
 set_context(pn_reactor_attachments(unwrap(r)), CONTAINER_CONTEXT, PN_VOID, 
);
 }

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b9a57e8a/proton-c/bindings/cpp/src/include/contexts.hpp
--
diff --git a/proton-c/bindings/cpp/src/include/contexts.hpp 
b/proton-c/bindings/cpp/src/include/contexts.hpp
index e80c434..742b346 100644
---

[4/6] qpid-proton git commit: PROTON-1344: Add pn_proactor_t and pn_listener_t to

2017-02-09 Thread astitcher 
PROTON-1344: Add pn_proactor_t and pn_listener_t to 


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/a96bccb2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/a96bccb2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/a96bccb2

Branch: refs/heads/master
Commit: a96bccb23209f2bcf82ea6d3508ce4ac77316b99
Parents: 3ca4bdc
Author: Andrew Stitcher 
Authored: Tue Feb 7 15:01:47 2017 -0500
Committer: Andrew Stitcher 
Committed: Thu Feb 9 21:31:15 2017 -0500

--
 proton-c/include/proton/listener.h | 15 +--
 proton-c/include/proton/proactor.h | 14 +-
 proton-c/include/proton/types.h|  6 ++
 3 files changed, 8 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a96bccb2/proton-c/include/proton/listener.h
--
diff --git a/proton-c/include/proton/listener.h 
b/proton-c/include/proton/listener.h
index 8b70c9a..729c095 100644
--- a/proton-c/include/proton/listener.h
+++ b/proton-c/include/proton/listener.h
@@ -20,6 +20,7 @@
  * under the License.
  */
 
+#include 
 #include 
 
 #ifdef __cplusplus
@@ -37,20 +38,6 @@ extern "C" {
  */
 
 /**
- * @cond INTERNAL
- */
-typedef struct pn_proactor_t pn_proactor_t;
-typedef struct pn_condition_t pn_condition_t;
-/**
- * @endcond
- */
-
-/**
- * A listener accepts connections.
- */
-typedef struct pn_listener_t pn_listener_t;
-
-/**
  * Create a listener.
  *
  * You can use pn_listener_set_context() or pn_listener_attachments() to set

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a96bccb2/proton-c/include/proton/proactor.h
--
diff --git a/proton-c/include/proton/proactor.h 
b/proton-c/include/proton/proactor.h
index b8fb16a..695bbb1 100644
--- a/proton-c/include/proton/proactor.h
+++ b/proton-c/include/proton/proactor.h
@@ -23,20 +23,13 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
- * @cond INTERNAL
- */
-typedef struct pn_condition_t pn_condition_t;
-/**
- * @endcond
- */
-
-/**
  * @file
  *
  * **Experimental** - Multithreaded IO
@@ -58,11 +51,6 @@ typedef struct pn_condition_t pn_condition_t;
  */
 
 /**
- * The proactor, see pn_proactor()
- */
-typedef struct pn_proactor_t pn_proactor_t;
-
-/**
  * Create a proactor. Must be freed with pn_proactor_free()
  */
 pn_proactor_t *pn_proactor(void);

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a96bccb2/proton-c/include/proton/types.h
--
diff --git a/proton-c/include/proton/types.h b/proton-c/include/proton/types.h
index c28beac..4400393 100644
--- a/proton-c/include/proton/types.h
+++ b/proton-c/include/proton/types.h
@@ -426,6 +426,12 @@ typedef struct pn_transport_t pn_transport_t;
  * A pn_handler_t is target of ::pn_event_t dispatched by the pn_reactor_t
  */
 typedef struct pn_handler_t pn_handler_t;
+
+/**
+ *
+ */
+typedef struct pn_proactor_t pn_proactor_t;
+typedef struct pn_listener_t pn_listener_t;
 /**
  * @endcond
  */


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[1/6] qpid-proton git commit: NO-JIRA: [C++ binding] Removed unnecessary include

2017-02-09 Thread astitcher 
Repository: qpid-proton
Updated Branches:
  refs/heads/master 5bce0dc19 -> b9a57e8a7


NO-JIRA: [C++ binding] Removed unnecessary include


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/8cc266e2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/8cc266e2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/8cc266e2

Branch: refs/heads/master
Commit: 8cc266e27f74f71ba0c1de67ee3a6475ae9a538d
Parents: 9de1cc1
Author: Andrew Stitcher 
Authored: Tue Feb 7 14:26:11 2017 -0500
Committer: Andrew Stitcher 
Committed: Wed Feb 8 14:39:21 2017 -0500

--
 proton-c/bindings/cpp/src/connection.cpp | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8cc266e2/proton-c/bindings/cpp/src/connection.cpp
--
diff --git a/proton-c/bindings/cpp/src/connection.cpp 
b/proton-c/bindings/cpp/src/connection.cpp
index 113932c..f706df4 100644
--- a/proton-c/bindings/cpp/src/connection.cpp
+++ b/proton-c/bindings/cpp/src/connection.cpp
@@ -31,7 +31,6 @@
 #include "proton/session_options.hpp"
 #include "proton/transport.hpp"
 
-#include "connector.hpp"
 #include "contexts.hpp"
 #include "msg.hpp"
 #include "proton_bits.hpp"


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[3/6] qpid-proton git commit: NO-JIRA: [C++ binding] make container test work with more containers

2017-02-09 Thread astitcher 
NO-JIRA: [C++ binding] make container test work with more containers


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/3ca4bdcd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/3ca4bdcd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/3ca4bdcd

Branch: refs/heads/master
Commit: 3ca4bdcd64d32fb5e81adb5c5467391d3bb11693
Parents: 8cc266e
Author: Andrew Stitcher 
Authored: Wed Feb 8 15:38:00 2017 -0500
Committer: Andrew Stitcher 
Committed: Thu Feb 9 21:23:20 2017 -0500

--
 proton-c/bindings/cpp/src/container_test.cpp | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3ca4bdcd/proton-c/bindings/cpp/src/container_test.cpp
--
diff --git a/proton-c/bindings/cpp/src/container_test.cpp 
b/proton-c/bindings/cpp/src/container_test.cpp
index 564a4ba..e02aff5 100644
--- a/proton-c/bindings/cpp/src/container_test.cpp
+++ b/proton-c/bindings/cpp/src/container_test.cpp
@@ -139,10 +139,12 @@ int test_container_bad_address() {
 proton::default_container c;
 // Default fixed-option listener. Valgrind for leaks.
 try { c.listen("999.666.999.666:0"); } catch (const proton::error&) {}
+c.run();
 // Dummy listener.
 test_listener l;
 test_handler h2(std::string("999.999.999.666"), 
proton::connection_options());
 try { c.listen("999.666.999.666:0", l); } catch (const proton::error&) {}
+c.run();
 ASSERT(!l.on_accept_);
 ASSERT(l.on_close_);
 ASSERT(!l.on_error_.empty());


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

qpid-cpp git commit: QPID-7666: Fixed minor inconsistency with journal-flush-timeout parameter not being scaled from ms to ns correctly

2017-02-09 Thread kpvdr 
Repository: qpid-cpp
Updated Branches:
  refs/heads/master 34cfb7f0a -> 13f0fe591


QPID-7666: Fixed minor inconsistency with journal-flush-timeout parameter not 
being scaled from ms to ns correctly


Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/13f0fe59
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/13f0fe59
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/13f0fe59

Branch: refs/heads/master
Commit: 13f0fe591a5ac025f98bb45f7084462ab2788f6e
Parents: 34cfb7f
Author: Kim van der Riet 
Authored: Thu Feb 9 13:41:45 2017 -0500
Committer: Kim van der Riet 
Committed: Thu Feb 9 13:41:45 2017 -0500

--
 src/qpid/linearstore/MessageStoreImpl.cpp | 20 +---
 src/qpid/linearstore/MessageStoreImpl.h   |  6 +++---
 2 files changed, 12 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/13f0fe59/src/qpid/linearstore/MessageStoreImpl.cpp
--
diff --git a/src/qpid/linearstore/MessageStoreImpl.cpp 
b/src/qpid/linearstore/MessageStoreImpl.cpp
index e3a8b4c..f84defc 100644
--- a/src/qpid/linearstore/MessageStoreImpl.cpp
+++ b/src/qpid/linearstore/MessageStoreImpl.cpp
@@ -58,7 +58,7 @@ MessageStoreImpl::MessageStoreImpl(qpid::broker::Broker* 
broker_, const char* en
tplWCachePgSizeSblks(0),
tplWCacheNumPages(0),
highestRid(0),
-   
journalFlushTimeout(defJournalFlushTimeoutNs),
+   journalFlushTimeoutNs(0),
isInit(false),
envPath(envpath_),
broker(broker_),
@@ -156,7 +156,7 @@ bool MessageStoreImpl::init(const qpid::Options* options_)
 uint16_t jrnlWrCacheNumPages = 
chkJrnlWrCacheNumPages(opts->wCacheNumPages, "wcache-num-pages");
 uint32_t tplJrnlWrCachePageSizeKib = 
chkJrnlWrPageCacheSize(opts->tplWCachePageSizeKib, "tpl-wcache-page-size");
 uint16_t tplJrnlWrCacheNumPages = 
chkJrnlWrCacheNumPages(opts->tplWCacheNumPages, "tpl-wcache-num-pages");
-journalFlushTimeout = opts->journalFlushTimeout;
+journalFlushTimeoutNs = opts->journalFlushTimeoutMs * 100;
 
 // Pass option values to init()
 return init(opts->storeDir,
@@ -204,10 +204,8 @@ bool MessageStoreImpl::init(const std::string& storeDir_,
 QLS_LOG(info,   "> Default number of write cache pages: " << 
wCacheNumPages);
 QLS_LOG(info,   "> TPL write cache page size: " << tplWCachePageSizeKib_ 
<< " (KiB)");
 QLS_LOG(info,   "> TPL number of write cache pages: " << 
tplWCacheNumPages);
-QLS_LOG(info,   "> EFP partition: " << defaultEfpPartitionNumber);
-QLS_LOG(info,   "> EFP file size pool: " << defaultEfpFileSize_kib << " 
(KiB)");
 QLS_LOG(info,   "> Overwrite before return to EFP: " << 
(overwriteBeforeReturnFlag?"True":"False"));
-QLS_LOG(info,   "> Maximum journal flush time: " << journalFlushTimeout);
+QLS_LOG(info,   "> Maximum journal flush time: " << 
(journalFlushTimeoutNs/100) << "ms");
 
 return isInit;
 }
@@ -262,7 +260,7 @@ void MessageStoreImpl::init(const bool truncateFlag)
 // NOTE: during normal initialization, agent == 0 because the 
store is initialized before the management infrastructure.
 // However during a truncated initialization in a cluster, agent 
!= 0. We always pass 0 as the agent for the
 // TplStore to keep things consistent in a cluster. See 
https://bugzilla.redhat.com/show_bug.cgi?id=681026
-tplStorePtr.reset(new TplJournalImpl(broker->getTimer(), 
"TplStore", getTplBaseDir(), jrnlLog, defJournalGetEventsTimeoutNs, 
journalFlushTimeout, 0));
+tplStorePtr.reset(new TplJournalImpl(broker->getTimer(), 
"TplStore", getTplBaseDir(), jrnlLog, defJournalGetEventsTimeoutNs, 
journalFlushTimeoutNs, 0));
 isInit = true;
 } catch (const DbException& e) {
 if (e.get_errno() == DB_VERSION_MISMATCH)
@@ -423,7 +421,7 @@ void 
MessageStoreImpl::create(qpid::broker::PersistableQueue& queue_,
 }
 
 jQueue = new JournalImpl(broker->getTimer(), queue_.getName(), 
getJrnlDir(queue_.getName()), jrnlLog,
- defJournalGetEventsTimeoutNs, 
journalFlushTimeout, agent,
+ defJournalGetEventsTimeoutNs, 
journalFlushTimeoutNs, agent,
  boost::bind(::journalDeleted, 
this, _1));
 {
 qpid::sys::Mutex::ScopedLock sl(journalListLock);
@@ -742,7 +740,7 @@ void MessageStoreImpl::recoverQueues(TxnCtxt& txn,
 break;
 }

svn commit: r1782302 - /qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java

2017-02-09 Thread rgodfrey 
Author: rgodfrey
Date: Thu Feb  9 10:15:29 2017
New Revision: 1782302

URL: http://svn.apache.org/viewvc?rev=1782302=rev
Log:
QPID-7668 : Add configuration for MySQL to JDBCDetails
This closes #2. 

Modified:

qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java

Modified: 
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java?rev=1782302=1782301=1782302=diff
==
--- 
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java
 Thu Feb  9 10:15:29 2017
@@ -62,6 +62,8 @@ public abstract class JDBCDetails
  true);
 private static final JDBCDetails DERBY = new KnownJDBCDetails("derby", 
"blob", "varchar(%d) for bit data", "bigint", false,
   true);
+private static final JDBCDetails MYSQL = new KnownJDBCDetails("mysql", 
"blob", "varbinary(%d)", "bigint", false,
+true);
 
 static
 {
@@ -73,6 +75,7 @@ public abstract class JDBCDetails
 map.put(SYBASE.getVendor(), SYBASE);
 map.put(POSTGRES.getVendor(), POSTGRES);
 map.put(DERBY.getVendor(), DERBY);
+map.put(MYSQL.getVendor(), MYSQL);
 map.put(FALLBACK.getVendor(), FALLBACK);
 }
 finally



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org