Scout-44 - applying patch

git-svn-id: https://svn.apache.org/repos/asf/webservices/scout/trunk@558566 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java b/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java
index 4fa048b..0ec2bed 100644
--- a/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java
+++ b/scout/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java
@@ -36,6 +36,7 @@
 import javax.xml.registry.infomodel.ClassificationScheme;

 import javax.xml.registry.infomodel.Concept;

 import javax.xml.registry.infomodel.Key;

+import javax.xml.registry.infomodel.LocalizedString;

 import javax.xml.registry.infomodel.Organization;

 import javax.xml.registry.infomodel.RegistryObject;

 import javax.xml.registry.infomodel.Service;

@@ -974,6 +975,7 @@
     }

 

     static Name[] mapNamePatterns(Collection namePatterns)

+        throws JAXRException

     {

         if (namePatterns == null)

             return null;

@@ -981,9 +983,15 @@
         int currLoc = 0;

         for (Iterator i = namePatterns.iterator(); i.hasNext();)

         {

-            String pattern = (String) i.next();

+            Object obj = i.next();

             Name n = Name.Factory.newInstance();

-            n.setStringValue(pattern);

+            if (obj instanceof String) {

+                n.setStringValue((String)obj);

+            } else if (obj instanceof LocalizedString) {

+                LocalizedString ls = (LocalizedString)obj;

+                n.setStringValue(ls.getValue());

+                n.setLang(ls.getLocale().getLanguage());

+            }

             result[currLoc] = n;

             currLoc++;

         }