svn commit: r1189002 - in /cxf/trunk/rt/databinding/aegis/src: main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java test/java/org/apache/cxf/aegis/integration/WrappedTest.java

[dkulp]

Author: dkulp
Date: Wed Oct 26 02:19:51 2011
New Revision: 1189002

URL: http://svn.apache.org/viewvc?rev=1189002&view=rev
Log:
Fix test failure on Java5

Modified:
    
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
    
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.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=1189002&r1=1189001&r2=1189002&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
 Wed Oct 26 02:19:51 2011
@@ -127,7 +127,8 @@ public abstract class AbstractTypeCreato
             result = getTypeMapping().getType(javaClass);
         } else {
             AegisType type = getTypeMapping().getType(info.getType());
-            if (type == null) {
+            if (type == null 
+                || (info.getTypeName() != null && 
!type.getSchemaType().equals(info.getTypeName()))) {
                 if (info.getTypeName() != null) {
                     type = getTypeMapping().getType(info.getTypeName());
                 }

Modified: 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java?rev=1189002&r1=1189001&r2=1189002&view=diff
==============================================================================
--- 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
 (original)
+++ 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
 Wed Oct 26 02:19:51 2011
@@ -45,8 +45,8 @@ public class WrappedTest extends Abstrac
         super.setUp();
         setEnableJDOM(true);
         arrayService = new ArrayService();
-        createService(BeanService.class, "BeanService");
         createService(ArrayService.class, arrayService, "Array", new 
QName("urn:Array", "Array"));
+        createService(BeanService.class, "BeanService");
         arrayWsdlDoc = getWSDLDocument("Array");
     }