You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2017/10/13 13:12:58 UTC
[1/2] brooklyn-server git commit: Fix npr when reading streamed bundle
Repository: brooklyn-server
Updated Branches:
refs/heads/master 4578d47df -> 7c6f7d416
Fix npr when reading streamed bundle
This happens when there is an existing unmanaged bundle with the same id
and a replacement bundle is uploaded without the force flag
Tested manually using boms and jars (yaml only and with java)
using curl and br tool.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c4f9d95a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c4f9d95a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c4f9d95a
Branch: refs/heads/master
Commit: c4f9d95aa2113a1a5022da17768675599e528dd4
Parents: 84e9e19
Author: Duncan Grant <du...@cloudsoftcorp.com>
Authored: Fri Oct 13 12:58:19 2017 +0100
Committer: Duncan Grant <du...@cloudsoftcorp.com>
Committed: Fri Oct 13 12:58:19 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c4f9d95a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
index ff84380..583e7cd 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
@@ -406,7 +406,7 @@ class OsgiArchiveInstaller {
// or if the bundle should be reinstalled/updated
if (!force) {
if (!isBringingExistingOsgiInstalledBundleUnderBrooklynManagement) {
- if (Objects.equal(b.get().getLocation(), suppliedKnownBundleMetadata.getUrl())) {
+ if (Objects.equal(b.get().getLocation(), inferredMetadata.getUrl())) {
// installation request was for identical location, so assume we are simply bringing under mgmt
log.debug("Request to install "+inferredMetadata+" from same location "+b.get().getLocation()+
" as existing OSGi installed (but not Brooklyn-managed) bundle "+b.get()+", so skipping reinstall");
[2/2] brooklyn-server git commit: This closes #862
Posted by tb...@apache.org.
This closes #862
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/7c6f7d41
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/7c6f7d41
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/7c6f7d41
Branch: refs/heads/master
Commit: 7c6f7d416dc54a0a84ea4af5098c1e7875c6c818
Parents: 4578d47 c4f9d95
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Fri Oct 13 14:12:11 2017 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Fri Oct 13 14:12:11 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------