svn commit: r695862 - in /servicemix/smx4/specs/trunk: jaxb-api-2.0/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java jaxb-api-2.1/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java

[gnodet]

Author: gnodet
Date: Tue Sep 16 06:07:29 2008
New Revision: 695862

URL: http://svn.apache.org/viewvc?rev=695862&view=rev
Log:
SM-1577: AbstractUnmarshallerImpl throws incorrect IllegalArgumentException in 
the JAXB2 specs

Modified:
    
servicemix/smx4/specs/trunk/jaxb-api-2.0/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
    
servicemix/smx4/specs/trunk/jaxb-api-2.1/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java

Modified: 
servicemix/smx4/specs/trunk/jaxb-api-2.0/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/jaxb-api-2.0/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java?rev=695862&r1=695861&r2=695862&view=diff
==============================================================================
--- 
servicemix/smx4/specs/trunk/jaxb-api-2.0/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
 (original)
+++ 
servicemix/smx4/specs/trunk/jaxb-api-2.0/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
 Tue Sep 16 06:07:29 2008
@@ -185,7 +185,7 @@
     }
 
     public final Object unmarshal(InputStream is) throws JAXBException {
-        if (reader == null) {
+        if (is == null) {
             throw new IllegalArgumentException("is must not be null");
         }
         return unmarshal(new InputSource(is));

Modified: 
servicemix/smx4/specs/trunk/jaxb-api-2.1/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/jaxb-api-2.1/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java?rev=695862&r1=695861&r2=695862&view=diff
==============================================================================
--- 
servicemix/smx4/specs/trunk/jaxb-api-2.1/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
 (original)
+++ 
servicemix/smx4/specs/trunk/jaxb-api-2.1/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
 Tue Sep 16 06:07:29 2008
@@ -185,7 +185,7 @@
     }
 
     public final Object unmarshal(InputStream is) throws JAXBException {
-        if (reader == null) {
+        if (is == null) {
             throw new IllegalArgumentException("is must not be null");
         }
         return unmarshal(new InputSource(is));