svn commit: r666932 - in /ode/trunk: bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java tasks/xmlbeans.rb utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java

[mriou]

Author: mriou
Date: Wed Jun 11 17:26:35 2008
New Revision: 666932

URL: http://svn.apache.org/viewvc?rev=666932&view=rev
Log:
Good ole' svn. Cleaning up git's mess.

Removed:
    ode/trunk/tasks/xmlbeans.rb
Modified:
    
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
    ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java

Modified: 
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java?rev=666932&r1=666931&r2=666932&view=diff
==============================================================================
--- 
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
 (original)
+++ 
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
 Wed Jun 11 17:26:35 2008
@@ -120,6 +120,7 @@
 import org.apache.ode.utils.stl.UnaryFunction;
 import org.apache.ode.utils.xsd.XSUtils;
 import org.apache.ode.utils.xsd.XsdException;
+import org.apache.ode.utils.xsd.SchemaModel;
 import org.apache.xerces.xni.parser.XMLEntityResolver;
 import org.w3c.dom.Node;
 
@@ -415,8 +416,13 @@
     public OXsdTypeVarType resolveXsdType(QName typeName) throws 
CompilationException {
         OXsdTypeVarType type = _oprocess.xsdTypes.get(typeName);
         if (type == null) {
-            if (!_wsdlRegistry.getSchemaModel().knowsSchemaType(typeName))
+            SchemaModel model = null;
+            try {
+                model = _wsdlRegistry.getSchemaModel();
+            } catch (IllegalArgumentException iaa) { }
+            if (model == null || !model.knowsSchemaType(typeName))
                 throw new 
CompilationException(__cmsgs.errUndeclaredXsdType(typeName));
+
             type = new OXsdTypeVarType(_oprocess);
             type.debugInfo = createDebugInfo(_processDef, "XSD Type: " + 
typeName);
             type.xsdType = typeName;

Modified: 
ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java?rev=666932&r1=666931&r2=666932&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java 
(original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java 
Wed Jun 11 17:26:35 2008
@@ -50,10 +50,7 @@
     private XSModel _model;
 
     private SchemaModelImpl(XSModel model) {
-        if (model == null) {
-            throw new NullPointerException("Null model.");
-        }
-
+        if (model == null) throw new IllegalArgumentException("Null model.");
         _model = model;
     }