Author: frm
Date: Fri Aug 4 08:35:33 2017
New Revision: 1804078
URL: http://svn.apache.org/viewvc?rev=1804078&view=rev
Log:
OAK-6518 - Throw an InvalidIndexException if an invalid magic number is detected
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoader.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoader.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoader.java?rev=1804078&r1=1804077&r2=1804078&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoader.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoader.java
Fri Aug 4 08:35:33 2017
@@ -61,7 +61,7 @@ public class IndexLoader {
int magic = meta.getInt();
if (magic != MAGIC) {
- return null; // magic byte mismatch
+ throw new InvalidIndexException("Magic number mismatch");
}
if (count < 1 || bytes < count * ENTRY_SIZE + FOOTER_SIZE || bytes %
blockSize != 0) {
