Skip to content

decompose conditional refactoring #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

decompose conditional refactoring #169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions io/src/main/java/org/apache/pdfbox/io/MemoryUsageSetting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ private MemoryUsageSetting(boolean useMainMemory, boolean useTempFile,
}
}

if (locUseMainMemory && (locMaxStorageBytes > -1) &&
((locMaxMainMemoryBytes == -1) || (locMaxMainMemoryBytes > locMaxStorageBytes)))
if (isMainMemoryValidAndStorageSpecified(locUseMainMemory, locMaxStorageBytes) &&
isMainMemoryGreaterOrUnlimitedThanStorage(locMaxMainMemoryBytes, locMaxStorageBytes))
{
locMaxStorageBytes = locMaxMainMemoryBytes;
}
Expand All @@ -97,7 +97,15 @@ private MemoryUsageSetting(boolean useMainMemory, boolean useTempFile,
this.maxMainMemoryBytes = locMaxMainMemoryBytes;
this.maxStorageBytes = locMaxStorageBytes;
}


private boolean isMainMemoryValidAndStorageSpecified(boolean locUseMainMemory, long locMaxStorageBytes) {
return locUseMainMemory && (locMaxStorageBytes > -1);
}

private boolean isMainMemoryGreaterOrUnlimitedThanStorage(long locMaxMainMemoryBytes, long locMaxStorageBytes) {
return (locMaxMainMemoryBytes == -1) || (locMaxMainMemoryBytes > locMaxStorageBytes);
}

/**
* Setups buffering memory usage to only use main-memory (no temporary file) which is not restricted in size.
*
Expand Down