svn commit: r821175 - in /cxf/branches/2.2.x-fixes: ./ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java

[dkulp]

Author: dkulp
Date: Fri Oct  2 21:30:49 2009
New Revision: 821175

URL: http://svn.apache.org/viewvc?rev=821175&view=rev
Log:
Merged revisions 821173 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r821173 | dkulp | 2009-10-02 17:27:55 -0400 (Fri, 02 Oct 2009) | 1 line
  
  [CXF-2457] Fix NPE in AbstractXOPType
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  2 21:30:49 2009
@@ -1 +1 @@
-/cxf/trunk:816407,817470-817676,817993
+/cxf/trunk:816407,817470-817676,817993,821173

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java?rev=821175&r1=821174&r2=821175&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java
 Fri Oct  2 21:30:49 2009
@@ -36,6 +36,7 @@
 import org.apache.cxf.aegis.type.basic.Base64Type;
 import org.apache.cxf.aegis.xml.MessageReader;
 import org.apache.cxf.aegis.xml.MessageWriter;
+import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.message.Attachment;
 import org.apache.ws.commons.schema.XmlSchemaElement;
@@ -74,6 +75,8 @@
         if (useXmimeBinaryType) {
         //      we use the XMIME type instead of the XSD type to allow for our 
content type attribute.
             setSchemaType(XML_MIME_BASE64);
+        } else {
+            setSchemaType(XmlSchemaConstants.BASE64BINARY_QNAME);
         }
     }