[ambari] branch branch-2.6 updated: [AMBARI-22857] Fix the if statement where & is used instead of &&

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jonathanhurley pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new 9e6eaae  [AMBARI-22857] Fix the if statement where & is used instead of &&
9e6eaae is described below

commit 9e6eaae572cf0779d31ef5a1f5d51e0cc3dff80f
Author: Aman Poonia <am...@gmail.com>
AuthorDate: Sat Jan 27 01:06:16 2018 +0530

    [AMBARI-22857] Fix the if statement where & is used instead of &&
---
 .../controller/utilities/state/DefaultServiceCalculatedState.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
index beca114..9363ef7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
@@ -117,7 +117,7 @@ public class DefaultServiceCalculatedState implements ServiceCalculatedState {
                 hasDisabled = true;
               }
 
-              if (isInMaintenance & !componentInfo.isClient()) {
+              if (isInMaintenance && !componentInfo.isClient()) {
                 hasMM = true;
                 if ( maxMMState == null || state.ordinal() > maxMMState.ordinal()) {
                   maxMMState = state;

-- 
To stop receiving notification emails like this one, please contact
jonathanhurley@apache.org.