commit 3f296f927d05219f22d0ade1712d8796a05da487
author Benson Margulies <bimargulies@apache.org> Thu Oct 14 02:20:05 2010 +0000
committer Benson Margulies <bimargulies@apache.org> Thu Oct 14 02:20:05 2010 +0000
tree 4a204d79357f3973a64b29a785759b2ee2904cc5
parent 6f3f2215e5eed3ddb29d477b3287728558de7cfb

relax check we can't really get away with imposing

git-svn-id: https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/XmlSchema@1022358 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/ws/commons/schema/XmlSchemaComplexType.java

diff --git a/src/main/java/org/apache/ws/commons/schema/XmlSchemaComplexType.java b/src/main/java/org/apache/ws/commons/schema/XmlSchemaComplexType.java
index 1ec4183..89c5fbf 100644
--- a/src/main/java/org/apache/ws/commons/schema/XmlSchemaComplexType.java
+++ b/src/main/java/org/apache/ws/commons/schema/XmlSchemaComplexType.java
@@ -165,5 +165,4 @@
     XmlSchemaParticle getParticleType() {

         return particleType;

     }

-

 }

src/main/java/org/apache/ws/commons/schema/XmlSchemaType.java

diff --git a/src/main/java/org/apache/ws/commons/schema/XmlSchemaType.java b/src/main/java/org/apache/ws/commons/schema/XmlSchemaType.java
index 7854278..25d7ebf 100644
--- a/src/main/java/org/apache/ws/commons/schema/XmlSchemaType.java
+++ b/src/main/java/org/apache/ws/commons/schema/XmlSchemaType.java
@@ -80,8 +80,8 @@
             return super.toString() + "[{}" + getName() + "]";
 
         } else {
-            return super.toString() 
-                + "[{" + namedDelegate.getParent().getLogicalTargetNamespace() + "}" 
+            return super.toString()
+                + "[{" + namedDelegate.getParent().getLogicalTargetNamespace() + "}"
                 + getName() + "]";
         }
     }
@@ -107,6 +107,14 @@
     }
 
     public void setName(String name) {
+       /*
+        * Inside a redefine, a 'non-top-level' type can have a name.
+        * This requires us to tolerate this case (non-top-level, named) even it
+        * in any other case it's completely invalid.
+        */
+        if (isTopLevel() && name == null) {
+            throw new XmlSchemaException("A non-top-level type may not be anonyous.");
+        }
         if (namedDelegate.isTopLevel() && namedDelegate.getName() != null) {
             namedDelegate.getParent().getSchemaTypes().remove(getQName());
         }