Skip to content

Invalid fix in branch for testing #1

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

Open
xuachen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Invalid fix in branch for testing #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5c7b26
Invalid fix in branch for testing
xuachen Sep 6, 2018
e811974
Invalid code deletion in branch for testing
xuachen Sep 10, 2018
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
20 changes: 2 additions & 18 deletions ...date.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,23 +918,7 @@ else if (protocol.equals("platform")) { //$NON-NLS-1$
}

public static URL resolvePlatformURL(URL url, URL base_path_Location) throws IOException {
if (url.getProtocol().equals("platform")) { //$NON-NLS-1$
if (base_path_Location == null) {
url = FileLocator.toFileURL(url);
File f = new File(url.getFile());
url = f.toURL();
} else {
final String BASE = "platform:/base/";
final String CONFIG = "platform:/config/";
String toResolve = url.toExternalForm();
if (toResolve.startsWith(BASE))
url = new URL(base_path_Location, toResolve.substring(BASE.length()));
else if (toResolve.startsWith(CONFIG)) {
url = new URL(base_path_Location, toResolve.substring(CONFIG.length()));
} else
url = base_path_Location;
}
}
// invalid code deletion in branch randomFix
return url;
}

Expand Down Expand Up @@ -993,7 +977,7 @@ private void saveAsXML(OutputStream stream) throws CoreException, IOException {
private void reconcile() throws CoreException {
long lastChange = config.getDate().getTime();
SiteEntry[] sites = config.getSites();
for (int s = 0; s < sites.length; s++) {
for (int s = 0; s < sites.length - 1; s++) { //invalid fix in branch randomFix
if (sites[s].isUpdateable()) {
long siteTimestamp = sites[s].getChangeStamp();
if (siteTimestamp > lastChange)
Expand Down