Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-12-21 15:59:48 +01:00
Code Issues Packages Projects Releases Activity

synchronize cache updates

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-12-12 17:31:55 +01:00
parent 1beaf9d53a
commit ee0972ef34
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
View File

@@ -96,6 +96,8 @@ public class GitBrowseCommand extends AbstractGitCommand
*/
private static final Logger logger =
LoggerFactory.getLogger(GitBrowseCommand.class);
private static final Object asyncMonitor = new Object();
private final LfsBlobStoreFactory lfsBlobStoreFactory;
private final SyncAsyncExecutor executor;
@@ -118,11 +120,6 @@ public class GitBrowseCommand extends AbstractGitCommand
if (revId != null) {
browserResult = new BrowserResult(revId.getName(), request.getRevision(), getEntry(repo, request, revId));
executor.execute(executionType -> {
if (executionType == ASYNCHRONOUS) {
updateCache(request);
}
}, () -> {});
return browserResult;
} else {
logger.warn("could not find head of repository {}, empty?", repository.getNamespaceAndName());
@@ -364,17 +361,19 @@ public class GitBrowseCommand extends AbstractGitCommand
Optional<LfsPointer> lfsPointer = commit.flatMap(this::getLfsPointer);
if (lfsPointer.isPresent()) {
setFileLengthFromLfsBlob(lfsPointer.get());
} else {
file.setLength(loader.getSize());
}
synchronized (asyncMonitor) {
if (lfsPointer.isPresent()) {
setFileLengthFromLfsBlob(lfsPointer.get());
} else {
file.setLength(loader.getSize());
}
file.setPartialResult(false);
if (commit.isPresent()) {
applyValuesFromCommit(executionType, commit.get());
} else {
logger.warn("could not find latest commit for {} on {}", path, revId);
file.setPartialResult(false);
if (commit.isPresent()) {
applyValuesFromCommit(executionType, commit.get());
} else {
logger.warn("could not find latest commit for {} on {}", path, revId);
}
}
}
@@ -433,9 +432,17 @@ public class GitBrowseCommand extends AbstractGitCommand
@Override
public void run() {
file.setPartialResult(false);
file.setComputationAborted(true);
updateCache(request);
synchronized (asyncMonitor) {
if (browserResult.getFile().getChildren().stream().anyMatch(FileObject::isPartialResult)) {
browserResult.getFile().getChildren().stream().filter(FileObject::isPartialResult).forEach(
f -> {
f.setPartialResult(false);
f.setComputationAborted(true);
}
);
updateCache(request);
}
}
}
}
}