From fb3f359b79d40853fd14b21e41be26ad4d44a242 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 3 Mar 2015 23:41:02 +0000
Subject: [PATCH] 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
---
 .../java/org/alfresco/repo/web/scripts/solr/SOLRSerializer.java | 2 +-
 .../org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/web/scripts/solr/SOLRSerializer.java b/source/java/org/alfresco/repo/web/scripts/solr/SOLRSerializer.java
index ad28845912..22c4b1750c 100644
--- a/source/java/org/alfresco/repo/web/scripts/solr/SOLRSerializer.java
+++ b/source/java/org/alfresco/repo/web/scripts/solr/SOLRSerializer.java
@@ -249,7 +249,7 @@ import org.springframework.extensions.webscripts.json.JSONUtils;
             {
                 public String convert(QName source)
                 {
-                    return source.toPrefixString(SOLRTypeConverter.this.namespaceService);
+                    return source.toString();
                 }
             });
             
diff --git a/source/test-java/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java b/source/test-java/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java
index 9f073f9e59..2a59942a91 100644
--- a/source/test-java/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java
+++ b/source/test-java/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java
@@ -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;