tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelvingood...@apache.org
Subject svn commit: r557257 - /incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
Date Wed, 18 Jul 2007 13:40:08 GMT
Author: kelvingoodson
Date: Wed Jul 18 06:40:07 2007
New Revision: 557257

URL: http://svn.apache.org/viewvc?view=rev&rev=557257
Log:
port commit 555786 to branch

Modified:
    incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java

Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java?view=diff&rev=557257&r1=557256&r2=557257
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
(original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
Wed Jul 18 06:40:07 2007
@@ -601,8 +601,8 @@
                     String attrValue = (String)omAttribObj;
 
                     Property property = dataObject.getType().getProperty(propertyName);
-                    Type propertyType = property.getType();
-                    if ("URI".equals(propertyType.getName())) {
+                    // property can be null for xsi:type
+                    if (property != null && "URI".equals(property.getType().getName()))
{
                         String namespace = null;
                         String localPart = attrValue;
                         



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message