Fix quality flaws

2 files changed, 6 insertions, 6 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRuleParam.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRuleParam.java
index 41451e6c305..d0d0066013b 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRuleParam.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRuleParam.java
@@ -138,8 +138,7 @@ public class ActiveRuleParam implements Cloneable {
 
   @Override
   public Object clone() {
-    String paramKey = getParamKey() != null ? getParamKey() : getRuleParam().getKey();
-    return new ActiveRuleParam(getActiveRule(), getRuleParam(), paramKey, getValue());
+    return new ActiveRuleParam(getActiveRule(), getRuleParam(), getParamKey() != null ? getParamKey() : getRuleParam().getKey(), getValue());
   }
 
 }
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java
index 6943949b5aa..7850a3d6708 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java
@@ -143,12 +143,13 @@ public class QProfileOperations implements ServerComponent {
   }
 
   @VisibleForTesting
-  boolean isCycle(QualityProfileDto childProfile, QualityProfileDto parentProfile, SqlSession session) {
-    while (parentProfile != null) {
-      if (childProfile.getName().equals(parentProfile.getName())) {
+  boolean isCycle(QualityProfileDto childProfile, @Nullable QualityProfileDto parentProfile, SqlSession session) {
+    QualityProfileDto currentParent = parentProfile;
+    while (currentParent != null) {
+      if (childProfile.getName().equals(currentParent.getName())) {
         return true;
       }
-      parentProfile = getParent(parentProfile, session);
+      currentParent = getParent(currentParent, session);
     }
     return false;
   }