You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sw...@apache.org on 2019/03/20 12:17:51 UTC
svn commit: r1855899 - in /ofbiz/ofbiz-framework/branches/release18.12: ./
framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java
Author: swapnilmmane
Date: Wed Mar 20 12:17:51 2019
New Revision: 1855899
URL: http://svn.apache.org/viewvc?rev=1855899&view=rev
Log:
Applied fix from trunk for revision: 1855898
===
Improved: Moved the nodeType check after node.getTextContent() method call
(OFBIZ-10832)
Since most nodes will contain text then it will be more efficient to do a null check after retrieving nodeValue.
Thanks: Scott for your valuable inputs.
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 20 12:17:51 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898
Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java?rev=1855899&r1=1855898&r2=1855899&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java Wed Mar 20 12:17:51 2019
@@ -516,17 +516,20 @@ public class ObjectType {
if (obj instanceof Node) {
Node node = (Node) obj;
- /* We can't get the text value of Document, Document Type and Notation Node,
- * thus simply returning the same object from simpleTypeOrObjectConvert method.
- * Please refer to OFBIZ-10832 Jira and
- * https://docs.oracle.com/javase/7/docs/api/org/w3c/dom/Node.html#getTextContent() for more details.
- */
- short nodeType = node.getNodeType();
- if (Node.DOCUMENT_NODE == nodeType || Node.DOCUMENT_TYPE_NODE == nodeType || Node.NOTATION_NODE == nodeType) {
- return obj;
- }
String nodeValue = node.getTextContent();
+
+ if (nodeValue == null) {
+ /* We can't get the text value of Document, Document Type and Notation Node,
+ * thus simply returning the same object from simpleTypeOrObjectConvert method.
+ * Please refer to OFBIZ-10832 Jira and
+ * https://docs.oracle.com/javase/7/docs/api/org/w3c/dom/Node.html#getTextContent() for more details.
+ */
+ short nodeType = node.getNodeType();
+ if (Node.DOCUMENT_NODE == nodeType || Node.DOCUMENT_TYPE_NODE == nodeType || Node.NOTATION_NODE == nodeType) {
+ return obj;
+ }
+ }
if ("String".equals(type) || "java.lang.String".equals(type)) {
return nodeValue;
}