Issue #111.

highsource · highsource · commit 6395b28077cc · 2015-12-07T21:46:55.000+01:00
diff --git a/nodejs/scripts/jsonix.js b/nodejs/scripts/jsonix.js
@@ -877,9 +877,16 @@ Jsonix.XML.QName.fromString = function(qNameAsString, namespaceContext, defaultN
 		localPart = prefixedName;
 	}
 	// If namespace URI was not set and we have a namespace context, try to find the namespace URI via this context
-	if (namespaceURI === null && namespaceContext)
+	if (namespaceURI === null)
 	{
-		namespaceURI = namespaceContext.getNamespaceURI(prefix);
+		if (prefix === '' && Jsonix.Util.Type.isString(defaultNamespaceURI))
+		{
+			namespaceURI = defaultNamespaceURI;
+		}
+		else if (namespaceContext)
+		{
+			namespaceURI = namespaceContext.getNamespaceURI(prefix);
+		}
 	}
 	// If we don't have a namespace URI, assume '' by default
 	// TODO document the assumption
diff --git a/scripts/src/main/javascript/org/hisrc/jsonix/Jsonix/XML/QName.js b/scripts/src/main/javascript/org/hisrc/jsonix/Jsonix/XML/QName.js
@@ -82,9 +82,16 @@ Jsonix.XML.QName.fromString = function(qNameAsString, namespaceContext, defaultN
 		localPart = prefixedName;
 	}
 	// If namespace URI was not set and we have a namespace context, try to find the namespace URI via this context
-	if (namespaceURI === null && namespaceContext)
+	if (namespaceURI === null)
 	{
-		namespaceURI = namespaceContext.getNamespaceURI(prefix);
+		if (prefix === '' && Jsonix.Util.Type.isString(defaultNamespaceURI))
+		{
+			namespaceURI = defaultNamespaceURI;
+		}
+		else if (namespaceContext)
+		{
+			namespaceURI = namespaceContext.getNamespaceURI(prefix);
+		}
 	}
 	// If we don't have a namespace URI, assume '' by default
 	// TODO document the assumption

Original file line number	Diff line number	Diff line change
`@@ -877,9 +877,16 @@ Jsonix.XML.QName.fromString = function(qNameAsString, namespaceContext, defaultN`
`877`	`877`	`localPart = prefixedName;`
`878`	`878`	`}`
`879`	`879`	`// If namespace URI was not set and we have a namespace context, try to find the namespace URI via this context`
`880`		`- if (namespaceURI === null && namespaceContext)`
	`880`	`+ if (namespaceURI === null)`
`881`	`881`	`{`
`882`		`- namespaceURI = namespaceContext.getNamespaceURI(prefix);`
	`882`	`+ if (prefix === '' && Jsonix.Util.Type.isString(defaultNamespaceURI))`
	`883`	`+ {`
	`884`	`+ namespaceURI = defaultNamespaceURI;`
	`885`	`+ }`
	`886`	`+ else if (namespaceContext)`
	`887`	`+ {`
	`888`	`+ namespaceURI = namespaceContext.getNamespaceURI(prefix);`
	`889`	`+ }`
`883`	`890`	`}`
`884`	`891`	`// If we don't have a namespace URI, assume '' by default`
`885`	`892`	`// TODO document the assumption`
Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,16 @@ Jsonix.XML.QName.fromString = function(qNameAsString, namespaceContext, defaultN`
`82`	`82`	`localPart = prefixedName;`
`83`	`83`	`}`
`84`	`84`	`// If namespace URI was not set and we have a namespace context, try to find the namespace URI via this context`
`85`		`- if (namespaceURI === null && namespaceContext)`
	`85`	`+ if (namespaceURI === null)`
`86`	`86`	`{`
`87`		`- namespaceURI = namespaceContext.getNamespaceURI(prefix);`
	`87`	`+ if (prefix === '' && Jsonix.Util.Type.isString(defaultNamespaceURI))`
	`88`	`+ {`
	`89`	`+ namespaceURI = defaultNamespaceURI;`
	`90`	`+ }`
	`91`	`+ else if (namespaceContext)`
	`92`	`+ {`
	`93`	`+ namespaceURI = namespaceContext.getNamespaceURI(prefix);`
	`94`	`+ }`
`88`	`95`	`}`
`89`	`96`	`// If we don't have a namespace URI, assume '' by default`
`90`	`97`	`// TODO document the assumption`