Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Goldthorpe2009-10-16 19:24:06 +0000
committerChris Goldthorpe2009-10-16 19:24:06 +0000
commit90ebdc6487ab8fd6a30d5e1043f3e714619c9cd6 (patch)
treec9aa64a23a0da56a7ca60506f1c3c94257e05cfd
parent3779a2ef497f7fe3858fe7673bdc94c5f356cbb4 (diff)
downloadeclipse.platform.ua-90ebdc6487ab8fd6a30d5e1043f3e714619c9cd6.tar.gz
eclipse.platform.ua-90ebdc6487ab8fd6a30d5e1043f3e714619c9cd6.tar.xz
eclipse.platform.ua-90ebdc6487ab8fd6a30d5e1043f3e714619c9cd6.zip
Bug 292563 – [Help] Remote content provider not called if local bundle exists
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java5
-rw-r--r--org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java2
2 files changed, 3 insertions, 4 deletions
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java b/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java
index e0f22b2ec..a88313c0f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java
@@ -1,5 +1,5 @@
/***************************************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
@@ -127,7 +127,8 @@ public class HelpURLConnection extends URLConnection {
if (in == null) {
in = ResourceLocator.openFromPlugin(plugin, getFile(), getLocale());
}
- } else {
+ }
+ if (in == null) {
in = openFromRemoteServer(getHref(), getLocale());
}
if (in == null) {
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java
index 863559b0d..d70c5e9f8 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/GetContentUsingRemoteHelp.java
@@ -69,7 +69,6 @@ public class GetContentUsingRemoteHelp extends TestCase {
assertEquals(localContent, remoteContent);
}
- /*
public void testRemoteUsedIfLocalUnavaliable() throws Exception {
final String path = "/data/help/nonlocal.html";
String plugin = "org.eclipse.help.base";
@@ -77,7 +76,6 @@ public class GetContentUsingRemoteHelp extends TestCase {
String expectedContent = RemoteTestUtils.createMockContent(plugin, path, "en");
assertEquals(expectedContent, remoteContent);
}
- */
public static String getHelpContent(String plugin, String path, String locale)
throws Exception {

Back to the top