You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/11/03 14:24:00 UTC
git commit: fixing error while starting app monitor
Repository: stratos
Updated Branches:
refs/heads/4.0.0-grouping c45a0ab20 -> 05d5c30df
fixing error while starting app monitor
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/05d5c30d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/05d5c30d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/05d5c30d
Branch: refs/heads/4.0.0-grouping
Commit: 05d5c30dfcbeb734f14c17d328a0a103fafec0b1
Parents: c45a0ab
Author: reka <rt...@gmail.com>
Authored: Mon Nov 3 18:53:44 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon Nov 3 18:53:44 2014 +0530
----------------------------------------------------------------------
.../autoscaler/monitor/ApplicationMonitorFactory.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/05d5c30d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java
index f693310..225dea1 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java
@@ -24,6 +24,7 @@ import org.apache.stratos.autoscaler.AutoscalerContext;
import org.apache.stratos.autoscaler.MemberStatsContext;
import org.apache.stratos.autoscaler.NetworkPartitionContext;
import org.apache.stratos.autoscaler.PartitionContext;
+import org.apache.stratos.autoscaler.applications.ApplicationHolder;
import org.apache.stratos.autoscaler.client.cloud.controller.CloudControllerClient;
import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
import org.apache.stratos.autoscaler.exception.DependencyBuilderException;
@@ -147,9 +148,9 @@ public class ApplicationMonitorFactory {
throws DependencyBuilderException,
TopologyInConsistentException {
ApplicationMonitor applicationMonitor;
- ApplicationManager.acquireReadLockForApplication(appId);
+ ApplicationHolder.acquireReadLock();
try {
- Application application = ApplicationManager.getApplications().getApplication(appId);
+ Application application = ApplicationHolder.getApplications().getApplication(appId);
if (application != null) {
applicationMonitor = new ApplicationMonitor(application);
applicationMonitor.setHasDependent(false);
@@ -159,7 +160,8 @@ public class ApplicationMonitorFactory {
throw new TopologyInConsistentException(msg);
}
} finally {
- ApplicationManager.releaseReadLockForApplication(appId);
+ ApplicationHolder.releaseReadLock();
+
}
return applicationMonitor;