Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

98422: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98303: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         98253: Fix for     MNT-13503    Solr throws exceptions when activating and then deactivating a model
         - also fixed running embedded tests
         98263: Fix for     MNT-13503    Solr throws exceptions when activating and then deactivating a model
         - fix failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98529 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-03-03 23:41:02 +00:00
parent 7543ed2201
commit fb3f359b79
2 changed files with 2 additions and 2 deletions

View File

@@ -770,7 +770,7 @@ public class SOLRWebScriptTest extends BaseWebScriptTest
String propName = (String)propNames.next();
String value = properties.getString(propName);
propertyMap.put(QName.createQName(propName, namespaceService), value);
propertyMap.put(QName.resolveToQName(namespaceService, propName), value);
}
return propertyMap;