cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1405152 - /cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
Date Fri, 02 Nov 2012 20:36:22 GMT
Author: dkulp
Date: Fri Nov  2 20:36:22 2012
New Revision: 1405152

URL: http://svn.apache.org/viewvc?rev=1405152&view=rev
Log:
[CXF-4605] When using a specific map type, make the type in the schema uniquely named to avoid
conflicts

Modified:
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java?rev=1405152&r1=1405151&r2=1405152&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
Fri Nov  2 20:36:22 2012
@@ -309,8 +309,11 @@ public abstract class AbstractTypeCreato
     }
 
     protected QName createMapQName(TypeClassInfo info, AegisType keyType, AegisType valueType)
{
-        String name = keyType.getSchemaType().getLocalPart() + '2' + valueType.getSchemaType().getLocalPart()
-                      + "Map";
+        String name = keyType.getSchemaType().getLocalPart() + '2' + valueType.getSchemaType().getLocalPart();
+        
+        
+        Class<?> cls = TypeUtil.getTypeRelatedClass(info.getType());
+        name += cls.getSimpleName();
 
         // TODO: Get namespace from XML?
         return new QName(tm.getMappingIdentifierURI(), name);



Mime
View raw message