summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2012-05-22 11:57:09 (EDT)
committer Mike Rennie2012-05-22 11:57:09 (EDT)
commit0198f262af33bc38a56c0c5fdb9408bcc877faa5 (patch)
tree25e621a3bbe495443731c978f19b5e84bb8090e0
parent9447c32c5689bd1f551bcfc19fcf3f8b8cb2e1bd (diff)
downloadeclipse.jdt.debug-0198f262af33bc38a56c0c5fdb9408bcc877faa5.zip
eclipse.jdt.debug-0198f262af33bc38a56c0c5fdb9408bcc877faa5.tar.gz
eclipse.jdt.debug-0198f262af33bc38a56c0c5fdb9408bcc877faa5.tar.bz2
Bug 380243 - Installed JREs not found on the Mac without internetv20120522-1557I20120522-2100I20120522-1900
connection
-rw-r--r--org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/MacInstalledJREs.java5
-rw-r--r--org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PListParser.java4
2 files changed, 5 insertions, 4 deletions
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/MacInstalledJREs.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/MacInstalledJREs.java
index f6e885f..429e63c 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/MacInstalledJREs.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/MacInstalledJREs.java
@@ -212,9 +212,8 @@ public class MacInstalledJREs {
}
return jres.toArray(new JREDescriptor[jres.size()]);
}
- }
- catch(CoreException ce) {
- //do nothing fall through and return no descriptors
+ } catch (CoreException ce) {
+ LaunchingPlugin.log(ce);
}
return NO_DESCRIPTORS;
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PListParser.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PListParser.java
index 8061708..23f4d7d 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PListParser.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PListParser.java
@@ -97,7 +97,9 @@ public class PListParser {
*/
private Object parseXML(InputStream stream) throws CoreException, ParserConfigurationException, IOException, SAXException {
Element root = null;
- DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ documentBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); //$NON-NLS-1$
+ DocumentBuilder parser = documentBuilderFactory.newDocumentBuilder();
parser.setErrorHandler(new DefaultHandler());
root = parser.parse(new InputSource(stream)).getDocumentElement();
if (!root.getNodeName().equalsIgnoreCase(PLIST_ELEMENT)) {