You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bi...@apache.org on 2009/12/29 12:33:40 UTC
svn commit: r894359 - in /ofbiz/trunk/framework:
base/src/org/ofbiz/base/util/UtilXml.java
entity/src/org/ofbiz/entity/serialize/XmlSerializer.java
Author: bibryam
Date: Tue Dec 29 11:33:39 2009
New Revision: 894359
URL: http://svn.apache.org/viewvc?rev=894359&view=rev
Log:
Use getLocalName() instead of getNodeName() and getTagName() methods. This change will fix errors in soap call, where elements have namespace prefixes.
I didn't notice any error caused from these changes, but it would be great if someone with more xml knowledge takes a loot at it.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java?rev=894359&r1=894358&r2=894359&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java Tue Dec 29 11:33:39 2009
@@ -726,7 +726,7 @@
if (node != null) {
do {
- if (node.getNodeType() == Node.ELEMENT_NODE && childElementNames.contains(node.getNodeName())) {
+ if (node.getNodeType() == Node.ELEMENT_NODE && childElementNames.contains(node.getLocalName())) {
Element childElement = (Element) node;
return childElement;
@@ -772,7 +772,7 @@
if (node != null) {
do {
if (node.getNodeType() == Node.ELEMENT_NODE && (childElementName == null ||
- childElementName.equals(node.getNodeName()))) {
+ childElementName.equals(node.getLocalName()))) {
Element childElement = (Element) node;
return childElement;
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java?rev=894359&r1=894358&r2=894359&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java Tue Dec 29 11:33:39 2009
@@ -246,7 +246,7 @@
}
public static Object deserializeSingle(Element element, Delegator delegator) throws SerializeException {
- String tagName = element.getTagName();
+ String tagName = element.getLocalName();
if (tagName.equals("null")) return null;
@@ -358,11 +358,12 @@
if (curChild.getNodeType() == Node.ELEMENT_NODE) {
Element curElement = (Element) curChild;
- if ("map-Entry".equals(curElement.getTagName())) {
+ if ("map-Entry".equals(curElement.getLocalName())) {
+
Element mapKeyElement = UtilXml.firstChildElement(curElement, "map-Key");
Element keyElement = null;
Node tempNode = mapKeyElement.getFirstChild();
-
+
while (tempNode != null) {
if (tempNode.getNodeType() == Node.ELEMENT_NODE) {
keyElement = (Element) tempNode;
@@ -402,7 +403,7 @@
}
public static Object deserializeCustom(Element element) throws SerializeException {
- String tagName = element.getTagName();
+ String tagName = element.getLocalName();
if ("cus-obj".equals(tagName)) {
String value = UtilXml.elementValue(element);
if (value != null) {
@@ -414,9 +415,9 @@
}
}
}
- throw new SerializeException("Problem deserializing object from byte array + " + element.getTagName());
+ throw new SerializeException("Problem deserializing object from byte array + " + element.getLocalName());
} else {
- throw new SerializeException("Cannot deserialize element named " + element.getTagName());
+ throw new SerializeException("Cannot deserialize element named " + element.getLocalName());
}
}