svn commit: r741316 - in /webservices/commons/trunk/modules/XmlSchema: ./ src/main/java/org/apache/ws/commons/schema/ src/test/java/tests/ src/test/test-resources/

[bimargulies]

Author: bimargulies
Date: Thu Feb  5 22:23:57 2009
New Revision: 741316

URL: http://svn.apache.org/viewvc?rev=741316&view=rev
Log:
Merged revisions 741242 via svnmerge from 
https://svn.apache.org/repos/asf/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH

........
  r741242 | bimargulies | 2009-02-05 13:55:20 -0500 (Thu, 05 Feb 2009) | 2 lines
  
  WSCOMMONS-436
........

Added:
    
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnnotationDeepTest.java
      - copied unchanged from r741242, 
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/test/java/tests/AnnotationDeepTest.java
    
webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/annotation-appinfo-deep.xsd
      - copied unchanged from r741242, 
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/test/test-resources/annotation-appinfo-deep.xsd
    
webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/annotation-appinfo-no-source.xsd
      - copied unchanged from r741242, 
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/test/test-resources/annotation-appinfo-no-source.xsd
Modified:
    webservices/commons/trunk/modules/XmlSchema/   (props changed)
    
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java

Propchange: webservices/commons/trunk/modules/XmlSchema/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb  5 22:23:57 2009
@@ -1 +1 @@
-/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH:1-726532
+/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH:1-741314

Modified: 
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java?rev=741316&r1=741315&r2=741316&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
 (original)
+++ 
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
 Thu Feb  5 22:23:57 2009
@@ -247,9 +247,10 @@
         XmlSchemaAppInfo appInfo = new XmlSchemaAppInfo();
         NodeList markup = new DocumentFragmentNodeList(content);
 
-        if (!content.hasAttribute("source")) {
-            return null;
-        }
+       if (!content.hasAttribute("source") && markup.getLength() == 0) {
+           return null;
+       }
+
         appInfo.setSource(getAttribute(content, "source"));
         appInfo.setMarkup(markup);
         return appInfo;