[jboss-svn-commits] JBoss Common SVN: r2126 - 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-13 08:43:40 -0400 (Fri, 13 Oct 2006)
New Revision: 2126

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/CharactersHandler.java
Log:
Improve the error message when characters are in the wrong place.

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/CharactersHandler.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/CharactersHandler.java	2006-10-13 12:28:41 UTC (rev 2125)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/CharactersHandler.java	2006-10-13 12:43:40 UTC (rev 2126)
@@ -27,6 +27,7 @@
 import javax.xml.namespace.NamespaceContext;
 
 import org.jboss.xb.binding.Constants;
+import org.jboss.xb.binding.JBossXBException;
 import org.jboss.xb.binding.SimpleTypeBindings;
 import org.jboss.xb.binding.JBossXBRuntimeException;
 import org.jboss.xb.binding.metadata.ValueMetaData;
@@ -108,7 +109,14 @@
       }
       else if(typeQName != null && Constants.NS_XML_SCHEMA.equals(typeQName.getNamespaceURI()))
       {
-         o = SimpleTypeBindings.unmarshal(typeQName.getLocalPart(), value, nsCtx);
+         try
+         {
+            o = SimpleTypeBindings.unmarshal(typeQName.getLocalPart(), value, nsCtx);
+         }
+         catch (IllegalStateException e)
+         {
+            throw new JBossXBRuntimeException("Characters are not allowed here", e);
+         }
       }
       else
       {