diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ConverterTestSetup.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ConverterTestSetup.java index 21570a14283..06ff2881142 100644 --- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ConverterTestSetup.java +++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ConverterTestSetup.java @@ -145,6 +145,9 @@ public void tearDownSuite() throws Exception { super.tearDownSuite(); } + protected String getExternalJCLPathString(String compliance) { + return null; + } @Override public void setUpJCLClasspathVariables(String compliance, boolean useFullJCL) throws JavaModelException, IOException { if (useFullJCL) { diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java index 264140bb25f..a5fe74910ab 100644 --- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java +++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java @@ -2535,7 +2535,11 @@ public void ensureChildExists(IParent container, IJavaElement child) throws Java protected String[] getJCLLibrary(String compliance) throws JavaModelException, IOException { // ensure that the requested JCL lib is setup (i.e. that the jclMinXY.jar is copied) setUpJCLClasspathVariables(compliance); - return new String[] {getExternalJCLPathString(compliance)}; + String externalJCLPathString = getExternalJCLPathString(compliance); + if (externalJCLPathString == null) { + return new String[] {}; + } + return new String[] {externalJCLPathString}; } /** * Returns the specified compilation unit in the given project, root, and