You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2016/04/04 19:47:51 UTC

[2/2] incubator-systemml git commit: [HOTFIX][SYSTEMML-612] Fix sort sparse rows npe on parallel read

[HOTFIX][SYSTEMML-612] Fix sort sparse rows npe on parallel read

Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/6608d0ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/6608d0ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/6608d0ff

Branch: refs/heads/master
Commit: 6608d0ffc169bf5a1a1c9f074f0907ca0b33402e
Parents: ba29d2d
Author: Matthias Boehm <mb...@us.ibm.com>
Authored: Mon Apr 4 10:37:38 2016 -0700
Committer: Matthias Boehm <mb...@us.ibm.com>
Committed: Mon Apr 4 10:37:38 2016 -0700

----------------------------------------------------------------------
 src/main/java/org/apache/sysml/runtime/io/MatrixReader.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6608d0ff/src/main/java/org/apache/sysml/runtime/io/MatrixReader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/io/MatrixReader.java b/src/main/java/org/apache/sysml/runtime/io/MatrixReader.java
index a686e50..2b206e6 100644
--- a/src/main/java/org/apache/sysml/runtime/io/MatrixReader.java
+++ b/src/main/java/org/apache/sysml/runtime/io/MatrixReader.java
@@ -195,9 +195,10 @@ public abstract class MatrixReader
 		@Override
 		public Object call() throws Exception {
 			SparseBlock sblock = _dest.getSparseBlock();
-			for( int i=_rl; i<_ru; i++ )
-				if( !sblock.isEmpty(i) )
-					sblock.sort(i);
+			if( sblock != null )
+				for( int i=_rl; i<_ru; i++ )
+					if( !sblock.isEmpty(i) )
+						sblock.sort(i);
 			return null;
 		}
 	}