You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/11/16 03:39:45 UTC

svn commit: r344849 - /geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/NamespaceElementConverter.java

Author: djencks
Date: Tue Nov 15 18:39:43 2005
New Revision: 344849

URL: http://svn.apache.org/viewcvs?rev=344849&view=rev
Log:
More GERONIMO-1175 problems.  Not sure why this used to work sometimes

Modified:
    geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/NamespaceElementConverter.java

Modified: geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/NamespaceElementConverter.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/NamespaceElementConverter.java?rev=344849&r1=344848&r2=344849&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/NamespaceElementConverter.java (original)
+++ geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/NamespaceElementConverter.java Tue Nov 15 18:39:43 2005
@@ -36,11 +36,9 @@
         end.toEndToken();
         while (cursor.hasNextToken() && cursor.isLeftOf(end)) {
             if (cursor.isStart()) {
-                if (namespace.equals(cursor.getName().getNamespaceURI())) {
-                    //already has correct schema, exit
-                    return;
+                if (!namespace.equals(cursor.getName().getNamespaceURI())) {
+                    cursor.setName(new QName(namespace, cursor.getName().getLocalPart()));
                 }
-                cursor.setName(new QName(namespace, cursor.getName().getLocalPart()));
             }
             cursor.toNextToken();
         }