From 96479d86f13b6f623c7b2845c688da189a887f98 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 31 Oct 2012 13:53:51 +0100 Subject: [PATCH] Revert SONAR-3922 --- .../src/main/java/org/sonar/batch/DefaultProfileLoader.java | 4 ++-- .../test/java/org/sonar/batch/DefaultProfileLoaderTest.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) 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..e4750794236 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/DefaultProfileLoaderTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/DefaultProfileLoaderTest.java @@ -21,6 +21,7 @@ package org.sonar.batch; import org.apache.commons.configuration.PropertiesConfiguration; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -63,6 +64,7 @@ public class DefaultProfileLoaderTest { * SONAR-3922 */ @Test + @Ignore public void should_check_language_property_before_global_property() { Settings settings = new Settings(); settings.setProperty("sonar.profile.java", "one"); -- 2.39.5