svn commit: r1022227 - in /webservices/commons/trunk/modules/XmlSchema: ./ src/main/java/org/apache/ws/commons/schema/XmlSchemaExternal.java

[dkulp]

Author: dkulp
Date: Wed Oct 13 18:34:09 2010
New Revision: 1022227

URL: http://svn.apache.org/viewvc?rev=1022227&view=rev
Log:
Using the existing schema that the import is added to as the schema is wrong 
and is producing a circular code path during serializing.   Need to talk to 
Benson about what the intent of this was.

Modified:
    webservices/commons/trunk/modules/XmlSchema/   (props changed)
    
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaExternal.java

Propchange: webservices/commons/trunk/modules/XmlSchema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 13 18:34:09 2010
@@ -1 +1 @@
-/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH:763303,993403
+/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH:763303,993403,998751

Propchange: webservices/commons/trunk/modules/XmlSchema/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Oct 13 18:34:09 2010
@@ -1 +1 @@
-/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH:1-741314,763303,993403
+/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH:1-741314,763303,993403,998751

Modified: 
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaExternal.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaExternal.java?rev=1022227&r1=1022226&r2=1022227&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaExternal.java
 (original)
+++ 
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaExternal.java
 Wed Oct 13 18:34:09 2010
@@ -32,7 +32,6 @@ public abstract class XmlSchemaExternal 
      * Creates new XmlSchemaExternal
      */
     protected XmlSchemaExternal(XmlSchema parent) {
-        this.schema = parent;
         parent.getExternals().add(this);
         parent.getItems().add(this);
     }
@@ -40,6 +39,9 @@ public abstract class XmlSchemaExternal 
     public XmlSchema getSchema() {
         return schema;
     }
+    public void setSchema(XmlSchema sc) {
+        schema = sc;
+    }
 
     public String getSchemaLocation() {
         return schemaLocation;