Browse Source

Fix FileSystemException in windows on plugin delete (#322)

tags/release-3.0.0
hazemkmammu 5 years ago
parent
commit
553a0753f5
1 changed files with 16 additions and 8 deletions
  1. 16
    8
      pf4j/src/main/java/org/pf4j/LegacyExtensionFinder.java

+ 16
- 8
pf4j/src/main/java/org/pf4j/LegacyExtensionFinder.java View File

@@ -20,6 +20,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
@@ -81,11 +82,14 @@ public class LegacyExtensionFinder extends AbstractExtensionFinder {
Set<String> bucket = new HashSet<>();

try {
Enumeration<URL> urls = ((PluginClassLoader) plugin.getPluginClassLoader()).findResources(getExtensionsResource());
if (urls.hasMoreElements()) {
collectExtensions(urls, bucket);
} else {
log.debug("Cannot find '{}'", getExtensionsResource());
log.debug("Read '{}'", getExtensionsResource());
ClassLoader pluginClassLoader = plugin.getPluginClassLoader();
try (InputStream resourceStream = pluginClassLoader.getResourceAsStream(getExtensionsResource())) {
if (resourceStream == null) {
log.debug("Cannot find '{}'", getExtensionsResource());
} else {
collectExtensions(resourceStream, bucket);
}
}

debugExtensions(bucket);
@@ -103,9 +107,13 @@ public class LegacyExtensionFinder extends AbstractExtensionFinder {
while (urls.hasMoreElements()) {
URL url = urls.nextElement();
log.debug("Read '{}'", url.getFile());
try (Reader reader = new InputStreamReader(url.openStream(), StandardCharsets.UTF_8)) {
LegacyExtensionStorage.read(reader, bucket);
}
collectExtensions(url.openStream(), bucket);
}
}

private void collectExtensions(InputStream inputStream, Set<String> bucket) throws IOException {
try (Reader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8)) {
LegacyExtensionStorage.read(reader, bucket);
}
}


Loading…
Cancel
Save