svn commit: r524770 - /incubator/woden/trunk/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java

[jkaputin]

Author: jkaputin
Date: Mon Apr  2 04:44:28 2007
New Revision: 524770

URL: http://svn.apache.org/viewvc?view=rev&rev=524770
Log:
Reversed r524140 which added a NPE workaround for
XmlSchema 1.3 RC1.

Modified:
    
incubator/woden/trunk/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java

Modified: 
incubator/woden/trunk/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java
URL: 
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java?view=diff&rev=524770&r1=524769&r2=524770
==============================================================================
--- 
incubator/woden/trunk/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java
 (original)
+++ 
incubator/woden/trunk/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java
 Mon Apr  2 04:44:28 2007
@@ -237,11 +237,7 @@
         while(includes.hasNext()) {
             Object o = includes.next();
             XmlSchemaExternal externalSchema = (XmlSchemaExternal)o;
-            XmlSchema schema = null;
-            //next if stmt work around for rel 1.0M7a for a regression with 
XmlSchema-1.3-RC1
-            if(externalSchema != null) {
-                schema = externalSchema.getSchema();
-            }
+            XmlSchema schema = externalSchema.getSchema();
             if(schema != null )
             {
                 String schemaTNS = schema.getTargetNamespace();



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]