- don't write encrypted file header, if no actual write happens inside of an encrypted writable file (temporary workaround only!)

- reduced loglevel
This commit is contained in:
Sebastian Stenzel
2016-02-21 23:34:03 +01:00
parent b48670e073
commit 7bc678d4dc
2 changed files with 5 additions and 2 deletions

View File

@@ -32,6 +32,7 @@ class CryptoWritableFile implements WritableFile {
private FileContentEncryptor encryptor;
private Future<Void> writeTask;
private boolean contentChanged = false;
public CryptoWritableFile(FileContentCryptor cryptor, WritableFile file) {
this.file = file;
@@ -54,6 +55,7 @@ class CryptoWritableFile implements WritableFile {
@Override
public int write(ByteBuffer source) {
contentChanged = true;
final int size = source.remaining();
final ByteBuffer cleartextCopy = ByteBuffer.allocate(size);
ByteBuffers.copy(source, cleartextCopy);
@@ -99,6 +101,7 @@ class CryptoWritableFile implements WritableFile {
@Override
public void truncate() {
contentChanged = true;
terminateAndWaitForWriteTask();
file.truncate();
initialize(0);
@@ -112,7 +115,7 @@ class CryptoWritableFile implements WritableFile {
@Override
public void close() {
try {
if (file.isOpen()) {
if (contentChanged && file.isOpen()) {
terminateAndWaitForWriteTask();
writeHeader();
}

View File

@@ -106,7 +106,7 @@ public class UriNormalizationFilter implements HttpFilter {
} else if (ArrayUtils.contains(DIRECTORY_METHODS, requestMethod)) {
return normalizedFolderRequest(originalRequest);
} else {
LOG.debug("Could not determine resource type of resource: {}", originalRequest.getRequestURI());
LOG.trace("Could not determine resource type of resource: {}", originalRequest.getRequestURI());
return originalRequest;
}
}