[118293] WSDL Model: ImportImpl needs to 'reinitialize' itself when the locationURI changes
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
index 72ad9eb..76c576e 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
@@ -490,6 +490,14 @@
{
if (!resolved)
{
+ // KB: bugzilla 118293
+ // If a user changes <wsdl:import> from a WSDL file to an XML Schema file
+ // or the other way around, we should set the variable for the first
+ // <wsdl:import> source to null. Here I am simply setting both variables to null,
+ // which will have the same effect.
+ eDefinition = null;
+ eSchema = null;
+
Definition definition = getEnclosingDefinition();
if (definition != null && definition.getDocumentBaseURI() != null)
{
