Repository: incubator-apex-malhar Updated Branches: refs/heads/release-3.3 040f8f777 -> 2bf088626
APEXMALHAR-2003 NPE in blockMetaDataIterator after recovery Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/4608f112 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/4608f112 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/4608f112 Branch: refs/heads/release-3.3 Commit: 4608f1120f63208b4483f6bc0e77f99d9a32a48d Parents: dc0e1a0 Author: Chandni Singh <[email protected]> Authored: Tue Feb 23 17:46:10 2016 -0800 Committer: Chandni Singh <[email protected]> Committed: Tue Feb 23 17:51:48 2016 -0800 ---------------------------------------------------------------------- .../java/com/datatorrent/lib/io/fs/AbstractFileSplitter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/4608f112/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileSplitter.java ---------------------------------------------------------------------- diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileSplitter.java b/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileSplitter.java index afd86cf..cd47d48 100644 --- a/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileSplitter.java +++ b/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileSplitter.java @@ -285,7 +285,7 @@ public abstract class AbstractFileSplitter extends BaseOperator private long pos; private int blockNumber; - private final transient AbstractFileSplitter splitter; + private final AbstractFileSplitter splitter; protected BlockMetadataIterator() { @@ -319,8 +319,8 @@ public abstract class AbstractFileSplitter extends BaseOperator } boolean isLast = length >= fileMetadata.getFileLength(); long lengthOfFileInBlock = isLast ? fileMetadata.getFileLength() : length; - BlockMetadata.FileBlockMetadata fileBlock = splitter - .buildBlockMetadata(pos, lengthOfFileInBlock, blockNumber, fileMetadata, isLast); + BlockMetadata.FileBlockMetadata fileBlock = splitter.buildBlockMetadata(pos, lengthOfFileInBlock, blockNumber, + fileMetadata, isLast); pos = lengthOfFileInBlock; return fileBlock; }
