jlengrand/vert.x
1
0
Fork 0
mirror of https://github.com/jlengrand/vert.x.git synced 2026-03-10 08:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add hydratation support in OSGi.

Browse Source 
Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>
This commit is contained in:
Clement Escoffier
2018-05-23 19:06:15 +02:00
parent b2aebb1c1e
commit c8d79efa30
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/io/vertx/core/file/impl/FileResolver.java
View File

@@ -131,20 +131,20 @@ public class FileResolver {
if (parentFileName != null) {
URL directoryContents = cl.getResource(parentFileName);
if (directoryContents != null) {
unpackUrlResource(directoryContents, parentFileName, cl);
unpackUrlResource(directoryContents, parentFileName, cl, true);
}
}
URL url = cl.getResource(fileName);
if (url != null) {
return unpackUrlResource(url, fileName, cl);
return unpackUrlResource(url, fileName, cl, false);
}
}
}
return file;
}
private File unpackUrlResource(URL url, String fileName, ClassLoader cl) {
private File unpackUrlResource(URL url, String fileName, ClassLoader cl, boolean isDir) {
String prot = url.getProtocol();
switch (prot) {
case "file":
@@ -154,7 +154,7 @@ public class FileResolver {
case "bundle": // Apache Felix, Knopflerfish
case "bundleentry": // Equinox
case "bundleresource": // Equinox
return unpackFromBundleURL(url);
return unpackFromBundleURL(url, isDir);
default:
throw new IllegalStateException("Invalid url protocol: " + prot);
}
@@ -272,11 +272,11 @@ public class FileResolver {
* @param url the url
* @return the extracted file
*/
private synchronized File unpackFromBundleURL(URL url) {
private synchronized File unpackFromBundleURL(URL url, boolean isDir) {
try {
File file = new File(cacheDir, url.getHost() + File.separator + url.getFile());
file.getParentFile().mkdirs();
if (url.toExternalForm().endsWith("/")) {
if (url.toExternalForm().endsWith("/") || isDir) {
// Directory
file.mkdirs();
} else {