CELIX-253: Applied bug fix patch for deployment_admin. Added .idea to .gitignore
The path fixes an issue in deployment admin where strcmp result was compared gt instead of !=. This resulted in some changes (version 9.0.0 -> version 10.0.0) not being triggered. Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/052a6116 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/052a6116 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/052a6116 Branch: refs/heads/develop Commit: 052a611656df5870af6672605e9a87b27b7f4884 Parents: 5e6d2f2 Author: Pepijn Noltes <[email protected]> Authored: Tue Sep 1 16:14:53 2015 +0200 Committer: Pepijn Noltes <[email protected]> Committed: Tue Sep 1 16:14:53 2015 +0200 ---------------------------------------------------------------------- .gitignore | 1 + deployment_admin/private/src/deployment_admin.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/052a6116/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index eb89068..98033a5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,5 @@ /.project .DS_Store +.idea build http://git-wip-us.apache.org/repos/asf/celix/blob/052a6116/deployment_admin/private/src/deployment_admin.c ---------------------------------------------------------------------- diff --git a/deployment_admin/private/src/deployment_admin.c b/deployment_admin/private/src/deployment_admin.c index 9f29866..f1ab5bc 100644 --- a/deployment_admin/private/src/deployment_admin.c +++ b/deployment_admin/private/src/deployment_admin.c @@ -218,7 +218,7 @@ static void *deploymentAdmin_poll(void *deploymentAdmin) { char *last = arrayList_get(versions, arrayList_size(versions) - 1); if (last != NULL) { - if (admin->current == NULL || strcmp(last, admin->current) > 0) { + if (admin->current == NULL || strcmp(last, admin->current) != 0) { int length = strlen(admin->pollUrl) + strlen(last) + 2; char request[length]; if (admin->current == NULL) {
