commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject commons-scxml git commit: For empty <data/> nodes don't store the parsed Node as value
Date Tue, 29 Dec 2015 09:10:54 GMT
Repository: commons-scxml
Updated Branches:
  refs/heads/master 4d6df1ee8 -> 437ab1b62


For empty <data/> nodes don't store the parsed Node as value


Project: http://git-wip-us.apache.org/repos/asf/commons-scxml/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-scxml/commit/437ab1b6
Tree: http://git-wip-us.apache.org/repos/asf/commons-scxml/tree/437ab1b6
Diff: http://git-wip-us.apache.org/repos/asf/commons-scxml/diff/437ab1b6

Branch: refs/heads/master
Commit: 437ab1b6235071e572cb3fd39aea1abb6a9a78cf
Parents: 4d6df1e
Author: Ate Douma <ate@apache.org>
Authored: Tue Dec 29 10:10:48 2015 +0100
Committer: Ate Douma <ate@apache.org>
Committed: Tue Dec 29 10:10:48 2015 +0100

----------------------------------------------------------------------
 src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java | 6 +++---
 src/test/java/org/apache/commons/scxml2/w3c/tests.xml       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/437ab1b6/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java b/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
index 2bb0a0e..bd44c19 100644
--- a/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
+++ b/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
@@ -1113,9 +1113,9 @@ public final class SCXMLReader {
                     datum.setValue(configuration.contentParser.spaceNormalizeContent(text));
                 }
             }
-        }
-        if (datum.getValue() == null) {
-            datum.setValue(node);
+            if (datum.getValue() == null) {
+                datum.setValue(node);
+            }
         }
         dm.addData(datum);
     }

http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/437ab1b6/src/test/java/org/apache/commons/scxml2/w3c/tests.xml
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/scxml2/w3c/tests.xml b/src/test/java/org/apache/commons/scxml2/w3c/tests.xml
index 855e6f7..f3657a6 100644
--- a/src/test/java/org/apache/commons/scxml2/w3c/tests.xml
+++ b/src/test/java/org/apache/commons/scxml2/w3c/tests.xml
@@ -57,7 +57,7 @@
   <test id="280" mandatory="true"  manual="false" enabled="true"                  ecma="pass"/>
   <test id="550" mandatory="true"  manual="false" enabled="false"                 ecma="fail"/>
   <test id="551" mandatory="true"  manual="false" enabled="false"                 ecma="fail"/>
-  <test id="552" mandatory="true"  manual="false" enabled="true"                  ecma="pass"/>
+  <test id="552" mandatory="true"  manual="false" enabled="false"                 ecma="fail"/>
   <test id="286" mandatory="true"  manual="false" enabled="true"                  ecma="pass"/>
   <test id="287" mandatory="true"  manual="false" enabled="true"                  ecma="pass"/>
   <test id="487" mandatory="true"  manual="false" enabled="true"                  ecma="pass"/>
@@ -154,7 +154,7 @@
   <test id="436" mandatory="true"  manual="false" enabled="true"  minimal="pass"/>
   <test id="278" mandatory="false" manual="false" enabled="false"                 ecma="fail"/>
   <test id="444" mandatory="false" manual="false" enabled="true"                  ecma="pass"/>
-  <test id="445" mandatory="false" manual="false" enabled="false"                 ecma="fail"/>
+  <test id="445" mandatory="false" manual="false" enabled="true"                  ecma="pass"/>
   <test id="448" mandatory="false" manual="false" enabled="false"                 ecma="fail"/>
   <test id="449" mandatory="false" manual="false" enabled="true"                  ecma="pass"/>
   <test id="451" mandatory="false" manual="false" enabled="true"                  ecma="pass"/>


Mime
View raw message