You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/02/25 22:50:17 UTC

[1/2] ambari git commit: AMBARI-9803. Ambari-server log is filled with ClusterNotFoundException (aonishuk)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 d052b0da0 -> 0c3326892
  refs/heads/trunk 08cdfdc66 -> a8d791381


AMBARI-9803. Ambari-server log is filled with ClusterNotFoundException (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a8d79138
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a8d79138
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a8d79138

Branch: refs/heads/trunk
Commit: a8d7913818f73e6650265600c389a1d01dc44c29
Parents: 08cdfdc
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Feb 25 23:50:06 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Feb 25 23:50:06 2015 +0200

----------------------------------------------------------------------
 .../ambari/server/controller/internal/StageResourceProvider.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d79138/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
index 3d014b8..e55897c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
@@ -307,7 +307,7 @@ public class StageResourceProvider extends AbstractControllerResourceProvider im
     Resource resource = new ResourceImpl(Resource.Type.Stage);
 
     Long clusterId = entity.getClusterId();
-    if (clusterId != null) {
+    if (clusterId != null && !clusterId.equals(Long.valueOf(-1L))) {
       try {
         Cluster cluster = clusters.getClusterById(clusterId);
 


[2/2] ambari git commit: AMBARI-9803. Ambari-server log is filled with ClusterNotFoundException (aonishuk)

Posted by ao...@apache.org.
AMBARI-9803. Ambari-server log is filled with ClusterNotFoundException (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0c332689
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0c332689
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0c332689

Branch: refs/heads/branch-2.0.0
Commit: 0c3326892a48200532dbde10c52baabd6b62d987
Parents: d052b0d
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Feb 25 23:50:08 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Feb 25 23:50:08 2015 +0200

----------------------------------------------------------------------
 .../ambari/server/controller/internal/StageResourceProvider.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0c332689/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
index 3d014b8..e55897c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
@@ -307,7 +307,7 @@ public class StageResourceProvider extends AbstractControllerResourceProvider im
     Resource resource = new ResourceImpl(Resource.Type.Stage);
 
     Long clusterId = entity.getClusterId();
-    if (clusterId != null) {
+    if (clusterId != null && !clusterId.equals(Long.valueOf(-1L))) {
       try {
         Cluster cluster = clusters.getClusterById(clusterId);