apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-28 08:47:29 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixup #49 Could not notify CliPluginRealmCache.

Browse Source 
Let's better not compare on realPaths. That would give unexpected
results in situations when something is symlinked into the source tree.
This commit is contained in:
Peter Palaga
2020-08-12 09:52:49 +02:00
parent 78f1b233d9
commit 44e29598ff
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
daemon/src/main/java/org/jboss/fuse/mvnd/plugin/CliPluginRealmCache.java
View File

@@ -442,8 +442,7 @@ public class CliPluginRealmCache
try {
if (event instanceof MavenExecutionRequest) {
/* Store the multiModuleProjectDirectory path */
multiModuleProjectDirectory = ((MavenExecutionRequest) event).getMultiModuleProjectDirectory().toPath()
.toRealPath();
multiModuleProjectDirectory = ((MavenExecutionRequest) event).getMultiModuleProjectDirectory().toPath();
} else if (event instanceof MavenExecutionResult) {
/* Evict the entries refering to jars under multiModuleProjectDirectory */
final Iterator<Entry<Key, ValidableCacheRecord>> i = cache.entrySet().iterator();
@@ -453,17 +452,7 @@ public class CliPluginRealmCache
for (URL url : record.getRealm().getURLs()) {
if (url.getProtocol().equals("file")) {
final Path path = Paths.get(url.toURI());
boolean remove = false;
if (path.startsWith(multiModuleProjectDirectory)) {
remove = true;
} else if (Files.exists(path)) {
/* Try to convert to real path only if the file exists */
final Path realPath = path.toRealPath();
if (realPath.startsWith(multiModuleProjectDirectory)) {
remove = true;
}
}
if (remove) {
log.debug(
"Removing PluginRealmCache entry {} because it refers to an artifact in the build tree {}",
entry.getKey(), path);