[jboss-svn-commits] JBoss Common SVN: r2108 - jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling

[jboss-svn-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2006-10-05 08:01:33 -0400 (Thu, 05 Oct 2006)
New Revision: 2108

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
Log:
Throw an error if we can't find the schema.
Also trap early attempts to push null objects onto the stack.

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java	2006-10-05 12:00:56 UTC (rev 2107)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java	2006-10-05 12:01:33 UTC (rev 2108)
@@ -185,6 +185,10 @@
             {
                particle = schemaBinding.getElementParticle(startName);
             }
+            else
+            {
+               throw new JBossXBRuntimeException("Failed to resolve schema nsURI=" + namespaceURI + " location=" + schemaLocation);
+            }
          }
          else
          {
@@ -1097,6 +1101,8 @@
 
       public StackItem(ModelGroupBinding.Cursor cursor, Object o, ParticleHandler handler)
       {
+         if (cursor == null)
+            throw new IllegalArgumentException("Null cursor");
          // this is modelgroup particle
          this.cursor = cursor;
          this.particle = cursor.getParticle();
@@ -1106,6 +1112,8 @@
 
       public StackItem(ParticleBinding particle, Object o, ParticleHandler handler)
       {
+         if (particle == null)
+            throw new IllegalArgumentException("Null particle");
          // this is element particle
          this.cursor = null;
          this.particle = particle;