You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2015/07/28 19:49:34 UTC
[1/2] qpid-proton git commit: PROTON-905: Revert "PROTON-905: fix to
prevent crash with latest qpidd"
Repository: qpid-proton
Updated Branches:
refs/heads/master 0dea44515 -> 0fa93bcbc
PROTON-905: Revert "PROTON-905: fix to prevent crash with latest qpidd"
This reverts commit d9ce3cfd0916ae3719cb39a83a6174c5f88b10bb.
The latest qpidd is crashing due to the PROTON-905 fix whilst running
the HA tests.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/4c84dd7c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/4c84dd7c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/4c84dd7c
Branch: refs/heads/master
Commit: 4c84dd7c3c708fd823116876cd65885a628f92ff
Parents: 0dea445
Author: Ken Giusti <kg...@apache.org>
Authored: Tue Jul 28 13:31:10 2015 -0400
Committer: Ken Giusti <kg...@apache.org>
Committed: Tue Jul 28 13:31:10 2015 -0400
----------------------------------------------------------------------
proton-c/src/engine/engine.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/4c84dd7c/proton-c/src/engine/engine.c
----------------------------------------------------------------------
diff --git a/proton-c/src/engine/engine.c b/proton-c/src/engine/engine.c
index 9043e0b..ffbdf95 100644
--- a/proton-c/src/engine/engine.c
+++ b/proton-c/src/engine/engine.c
@@ -761,7 +761,7 @@ void pn_clear_modified(pn_connection_t *connection, pn_endpoint_t *endpoint)
// the modified list (see pni_preserve_child() - the endpoint is considered
// 'bound'). This increment/decrement will re-run the finalize in this
// case.
- if (endpoint != &connection->endpoint && endpoint->freed && !endpoint->referenced) {
+ if (endpoint != &connection->endpoint) {
pn_incref(endpoint);
pn_decref(endpoint);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-proton git commit: PROTON-905: Revert "PROTON-905: fix
leak of session/links when not using events"
Posted by kg...@apache.org.
PROTON-905: Revert "PROTON-905: fix leak of session/links when not using events"
This reverts commit 653f4e5fe2b9307dccced0a5a85028d1ca67c66a.
This patch causes crashes in qpidd when running its HA tests.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/0fa93bcb
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/0fa93bcb
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/0fa93bcb
Branch: refs/heads/master
Commit: 0fa93bcbc0b5cb2988254eadf1bbd8a7f62f87eb
Parents: 4c84dd7
Author: Ken Giusti <kg...@apache.org>
Authored: Tue Jul 28 13:32:33 2015 -0400
Committer: Ken Giusti <kg...@apache.org>
Committed: Tue Jul 28 13:32:33 2015 -0400
----------------------------------------------------------------------
proton-c/src/engine/engine.c | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/0fa93bcb/proton-c/src/engine/engine.c
----------------------------------------------------------------------
diff --git a/proton-c/src/engine/engine.c b/proton-c/src/engine/engine.c
index ffbdf95..7f99b64 100644
--- a/proton-c/src/engine/engine.c
+++ b/proton-c/src/engine/engine.c
@@ -757,14 +757,6 @@ void pn_clear_modified(pn_connection_t *connection, pn_endpoint_t *endpoint)
endpoint->transport_next = NULL;
endpoint->transport_prev = NULL;
endpoint->modified = false;
- // PROTON-905: the endpoint object's finalize can be blocked when it is on
- // the modified list (see pni_preserve_child() - the endpoint is considered
- // 'bound'). This increment/decrement will re-run the finalize in this
- // case.
- if (endpoint != &connection->endpoint) {
- pn_incref(endpoint);
- pn_decref(endpoint);
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org