Repository: incubator-systemml Updated Branches: refs/heads/master 7a30925e6 -> 829c4dd12
[SYSTEMML-1164] Fix IterablePredicate.toString NPE for incrementExpr Add a null check for _incrementExpr to IterablePredicate's toString method, since otherwise a NullPointerException can occur, such as when DMLProgram's toString method is called, which can call IterablePredicate's toString. Closes #327. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/829c4dd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/829c4dd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/829c4dd1 Branch: refs/heads/master Commit: 829c4dd12594ab3f02ef7813afc93494a7938c1c Parents: 7a30925 Author: Deron Eriksson <[email protected]> Authored: Fri Jan 6 12:36:09 2017 -0800 Committer: Deron Eriksson <[email protected]> Committed: Fri Jan 6 12:36:09 2017 -0800 ---------------------------------------------------------------------- src/main/java/org/apache/sysml/parser/IterablePredicate.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/829c4dd1/src/main/java/org/apache/sysml/parser/IterablePredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/parser/IterablePredicate.java b/src/main/java/org/apache/sysml/parser/IterablePredicate.java index e145eb7..86562fb 100644 --- a/src/main/java/org/apache/sysml/parser/IterablePredicate.java +++ b/src/main/java/org/apache/sysml/parser/IterablePredicate.java @@ -56,8 +56,10 @@ public class IterablePredicate extends Expression sb.append(_fromExpr.toString()); sb.append(","); sb.append(_toExpr.toString()); - sb.append(","); - sb.append(_incrementExpr.toString()); + if (_incrementExpr != null) { + sb.append(","); + sb.append(_incrementExpr.toString()); + } sb.append( ")" ); if (_parforParams != null && _parforParams.size() > 0){ for (String key : _parforParams.keySet())
