*** xfire-aegis/src/main/org/codehaus/xfire/aegis/type/XMLTypeCreator.java	13 Jan 2006 18:00:40 -0000	1.20
--- xfire-aegis/src/main/org/codehaus/xfire/aegis/type/XMLTypeCreator.java	31 Jan 2006 12:03:32 -0000
***************
*** 133,145 ****
      protected Type createMapType(TypeClassInfo info)
      {
          Element mapping = findMapping(info.getTypeClass());
!         if (mapping != null)
          {
              return super.createMapType(info);
          }
          else
          {
!             return nextCreator.createMapType(info); 
          }
      }
  
--- 133,153 ----
      protected Type createMapType(TypeClassInfo info)
      {
          Element mapping = findMapping(info.getTypeClass());
!         Element keyMapping = null;
!         Element componentMapping = null;
!         if (info.getKeyType() instanceof Class) {
!             keyMapping = findMapping((Class)info.getKeyType());
!         }
!         if (info.getGenericType() instanceof Class) {
!             componentMapping = findMapping((Class)info.getGenericType());
!         }
!         if ((mapping != null) || (keyMapping != null) || (componentMapping != null))
          {
              return super.createMapType(info);
          }
          else
          {
!             return nextCreator.createMapType(info);
          }
      }