From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Wed, 7 Nov 2012 13:00:25 +0000 (+0100)
Subject: Revert SONAR-3922
X-Git-Tag: 3.4~368
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=efc6da2339a20d10756f821980b5cd907e28acef;p=sonarqube.git

Revert SONAR-3922
---

diff --git a/sonar-batch/src/main/java/org/sonar/batch/DefaultProfileLoader.java b/sonar-batch/src/main/java/org/sonar/batch/DefaultProfileLoader.java
index c4faf1517d9..751508ea40b 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/DefaultProfileLoader.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/DefaultProfileLoader.java
@@ -38,8 +38,8 @@ public class DefaultProfileLoader implements ProfileLoader {
 
   public RulesProfile load(Project project) {
     String profileName = StringUtils.defaultIfBlank(
-      settings.getString("sonar.profile." + project.getLanguageKey()),
-      settings.getString("sonar.profile")
+      settings.getString("sonar.profile"),
+      settings.getString("sonar.profile." + project.getLanguageKey())
     );
 
     if (StringUtils.isBlank(profileName)) {
diff --git a/sonar-batch/src/test/java/org/sonar/batch/DefaultProfileLoaderTest.java b/sonar-batch/src/test/java/org/sonar/batch/DefaultProfileLoaderTest.java
index 8a7df9cb578..410e8032ac7 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/DefaultProfileLoaderTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/DefaultProfileLoaderTest.java
@@ -59,21 +59,6 @@ public class DefaultProfileLoaderTest {
     assertThat(profile.getName()).isEqualTo("legacy profile");
   }
 
-  /**
-   * SONAR-3922
-   */
-  @Test
-  public void should_check_language_property_before_global_property() {
-    Settings settings = new Settings();
-    settings.setProperty("sonar.profile.java", "one");
-    settings.setProperty("sonar.profile", "two");
-    when(dao.getProfile(Java.KEY, "one")).thenReturn(RulesProfile.create("one", "java"));
-
-    RulesProfile profile = new DefaultProfileLoader(dao, settings).load(javaProject);
-
-    assertThat(profile.getName()).isEqualTo("one");
-  }
-
   @Test
   public void should_fail_if_not_found() {
     Settings settings = new Settings();