From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Fri, 27 Sep 2013 09:58:39 +0000 (+0200)
Subject: SONAR-4730 Db upgrade 418 fails on Oracle
X-Git-Tag: 3.7.2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=49eba79f56751dbe8ad7d1914e9cd40d8945d159;p=sonarqube.git

SONAR-4730 Db upgrade 418 fails on Oracle
---

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/418_migrate_default_permissions.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/418_migrate_default_permissions.rb
index c337013e57e..beb2df33277 100644
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/418_migrate_default_permissions.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/418_migrate_default_permissions.rb
@@ -85,7 +85,7 @@ class MigrateDefaultPermissions < ActiveRecord::Migration
       existing_properties["sonar.role.user.#{qualifier}.defaultUsers"] = Property.find_by_prop_key("sonar.role.user.#{qualifier}.defaultUsers")
       existing_properties["sonar.role.codeviewer.#{qualifier}.defaultUsers"] = Property.find_by_prop_key("sonar.role.codeviewer.#{qualifier}.defaultUsers")
 
-      configured_values = existing_properties.values.reject {|prop| prop.nil?}
+      configured_values = existing_properties.values.reject {|prop| prop.nil? || prop.text_value.nil?}
 
       # Existing properties are migrated only when upgrading an existing SonarQube instance
       # Subviews permissions are not migrated since they are not used