Skip to content

Fix TargetWeaver.getDevProperties() to decode fgDevPropertiesURL #1709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merks merged 1 commit into from
Mar 28, 2025
Merged

Fix TargetWeaver.getDevProperties() to decode fgDevPropertiesURL #1709

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetWeaver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down Expand Up @@ -78,13 +80,10 @@ private static synchronized Properties getDevProperties() {
fgDevProperties = new Properties();
try {
URL url = new URL(fgDevPropertiesURL);
String path = url.getFile();
if (path != null && path.length() > 0) {
File file = new File(path);
if (file.exists()) {
try (InputStream stream = new FileInputStream(file)) {
fgDevProperties.load(stream);
}
File file = toFile(url);
if (file.exists()) {
try (InputStream stream = new FileInputStream(file)) {
fgDevProperties.load(stream);
}
}
} catch (IOException e) {
Expand Down Expand Up @@ -217,4 +216,13 @@ private static Bundle findRunningPlatformBundle(String symbolicName, String vers
}
return Arrays.stream(platformBundles).filter(b -> b.getVersion().equals(version)).findAny().orElse(null);
}

private static File toFile(URL url) {
try {
URI uri = url.toURI();
return new File(uri);
} catch (URISyntaxException e) {
return new File(url.getFile());
}
}
}
Loading