svn commit: r595258 - in /incubator/tuscany/java/sdo: impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java tools-test/src/test/java/org/apache/tuscany/sdo/test/SubstitutionWithExtensionValuesTestCase.java

[kelvingoodson]

Author: kelvingoodson
Date: Thu Nov 15 01:59:08 2007
New Revision: 595258

URL: http://svn.apache.org/viewvc?rev=595258&view=rev
Log:
Fix for TUSCANY-1842

Modified:
    
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
    
incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/SubstitutionWithExtensionValuesTestCase.java

Modified: 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java?rev=595258&r1=595257&r2=595258&view=diff
==============================================================================
--- 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
 (original)
+++ 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
 Thu Nov 15 01:59:08 2007
@@ -624,6 +624,12 @@
                 }
                 isInModels = false;
               }
+              // TODO The following 3 lines of code are a temporary 
work-around for JIRA issue TUSCANY-1862. 
+              // These lines of code should be removed when TUSCANY-1862 is 
resolved.
+              if ("".equals(uri) && "objectsToAttach".equals(name) && text != 
null && text.length() == 0)
+              {
+                text = null;
+              }              
               super.endElement(uri, localName, name);
             }
 

Modified: 
incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/SubstitutionWithExtensionValuesTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/SubstitutionWithExtensionValuesTestCase.java?rev=595258&r1=595257&r2=595258&view=diff
==============================================================================
--- 
incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/SubstitutionWithExtensionValuesTestCase.java
 (original)
+++ 
incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/SubstitutionWithExtensionValuesTestCase.java
 Thu Nov 15 01:59:08 2007
@@ -127,8 +127,7 @@
     assertEquals(20, extendedMetaData.getMaxLengthFacet(commentSimpleType));
   }
 
-  // FIXME Test disable pending fix of TUSCANY-1842
-  public void dontTestComplexTypeWithSimpleContentExtensionChangeSummary() 
throws IOException 
+  public void testComplexTypeWithSimpleContentExtensionChangeSummary() throws 
IOException 
   {
     DataGraph dg = SDOUtil.createDataGraph();
     SDOUtil.setRootObject(dg, dataObject);



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]