CodeBlock fix the boundary issue....

MergeFileIterator fix the NullpointerException.....