Fixes for STRATOS-1606
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ff1e1bd1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ff1e1bd1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ff1e1bd1 Branch: refs/heads/stratos-4.1.x Commit: ff1e1bd1abbbdb7e755d5816fa2c1fb9afe834a3 Parents: d1f5f08 Author: gayangunarathne <[email protected]> Authored: Fri Nov 6 17:57:11 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Fri Nov 6 17:57:11 2015 +0530 ---------------------------------------------------------------------- .../ArtifactDistributionCoordinator.java | 79 +++++++++++--------- 1 file changed, 45 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ff1e1bd1/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java index 8a71a1c..e03bbcb 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java @@ -120,40 +120,51 @@ public class ArtifactDistributionCoordinator { try { List<ApplicationSignUp> applicationSignUps = applicationSignUpManager.getApplicationSignUpsForRepository(repoUrl); if ((applicationSignUps == null) || (applicationSignUps.size() == 0)) { - if (log.isWarnEnabled()) { - log.warn(String.format("Artifact updated event not sent, " + - "application signups not found for repository: [repo-url] %s", repoUrl)); - return; - } - - for (ApplicationSignUp applicationSignUp : applicationSignUps) { - if (applicationSignUp.getArtifactRepositories() != null) { - for (ArtifactRepository artifactRepository : applicationSignUp.getArtifactRepositories()) { - if ((artifactRepository != null) && (artifactRepository.getRepoUrl().equals(repoUrl))) { - - String applicationId = applicationSignUp.getApplicationId(); - int tenantId = applicationSignUp.getTenantId(); - String clusterId = findClusterId(applicationId, artifactRepository.getAlias()); - - publisher.publishArtifactUpdatedEvent(clusterId, - String.valueOf(applicationSignUp.getTenantId()), - artifactRepository.getRepoUrl(), - artifactRepository.getRepoUsername(), - artifactRepository.getRepoPassword(), false); - - if (log.isInfoEnabled()) { - log.info(String.format("Artifact updated event published: [application-id] %s " + - "[tenant-id] %d [cartridge-type] %s [alias] %s [repo-url] %s", - applicationId, - tenantId, - artifactRepository.getCartridgeType(), - artifactRepository.getAlias(), - artifactRepository.getRepoUrl())); - } - } - } - } - } + if (log.isWarnEnabled()) { + log.warn(String.format("Artifact updated event not sent, " + + "application signups not found for repository: [repo-url] %s", repoUrl)); + return; + } else { + for (ApplicationSignUp applicationSignUp : applicationSignUps) { + if (applicationSignUp.getArtifactRepositories() != null) { + for (ArtifactRepository artifactRepository : applicationSignUp.getArtifactRepositories()) { + if ((artifactRepository != null) && (artifactRepository.getRepoUrl().equals(repoUrl))) { + + + String applicationId = applicationSignUp.getApplicationId(); + int tenantId = applicationSignUp.getTenantId(); + String clusterId = findClusterId(applicationId, artifactRepository.getAlias()); + + publisher.publishArtifactUpdatedEvent(clusterId, + String.valueOf( + applicationSignUp.getTenantId()), + artifactRepository.getRepoUrl(), + artifactRepository.getRepoUsername(), + artifactRepository.getRepoPassword(), false); + + if (log.isInfoEnabled()) { + log.info( + String.format("Artifact updated event published: [application-id] %s" + + " " + + "[tenant-id] %d [cartridge-type] %s [alias] %s [repo-url" + + "] %s", + applicationId, + tenantId, + artifactRepository.getCartridgeType(), + artifactRepository.getAlias(), + artifactRepository.getRepoUrl())); + } + } + } + } else { + if (log.isWarnEnabled()) { + log.warn(String.format("Application signUp artifact repositories are empty for %s", + repoUrl)); + return; + } + } + } + } } } catch (Exception e) { String message = "Could not notify artifact updated event";
