You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2015/03/03 10:14:42 UTC
svn commit: r1663563 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java
oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
Author: mduerig
Date: Tue Mar 3 09:14:42 2015
New Revision: 1663563
URL: http://svn.apache.org/r1663563
Log:
OAK-2561: Add option to oak-run check runmode to check consistency of binary properties
Correct handling of 0 and -1 values for --bin
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java?rev=1663563&r1=1663562&r2=1663563&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java Tue Mar 3 09:14:42 2015
@@ -215,8 +215,11 @@ public class ConsistencyChecker {
}
private static void traverse(Blob blob, long length) throws IOException {
- InputStream s = blob.getNewStream();
+ if (length < 0) {
+ length = Long.MAX_VALUE;
+ }
if (length > 0) {
+ InputStream s = blob.getNewStream();
try {
byte[] buffer = new byte[8192];
int l = s.read(buffer, 0, (int) min(buffer.length, length));
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1663563&r1=1663562&r2=1663563&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Tue Mar 3 09:14:42 2015
@@ -731,10 +731,6 @@ public class Main {
boolean fullTraversal = options.has(deep);
long debugLevel = deep.value(options);
long binLen = bin.value(options);
- if (binLen < 0) {
- binLen = Long.MAX_VALUE;
- }
-
checkConsistency(dir, journalFileName, fullTraversal, debugLevel, binLen);
}