Fix for bug 400060 - reverting the changes to the PackageFragment and

adjusting failing test accordingly

2 files changed, 4 insertions, 10 deletions

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AttachedJavadocTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AttachedJavadocTests.java
index 4868f919a0..d5d2351f17 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AttachedJavadocTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AttachedJavadocTests.java
@@ -1167,7 +1167,9 @@ public class AttachedJavadocTests extends ModifyingResourceTests {
 			String javadoc = packageFragment.getAttachedJavadoc(new NullProgressMonitor()); //$NON-NLS-1$
 			assertNull("Javadoc should be null", javadoc); //$NON-NLS-1$
 		} catch(JavaModelException jme) {
-			fail("Should not throw Java Model Exception");
+			if (!(jme.getCause() instanceof FileNotFoundException)) {
+				fail("Should not throw Java Model Exception");
+			}
 		}
 	}
 }
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragment.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragment.java
index 2afacc1adb..5408aef33d 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragment.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragment.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.core;
 
-import java.io.FileNotFoundException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -482,14 +481,7 @@ public String getAttachedJavadoc(IProgressMonitor monitor) throws JavaModelExcep
 	pathBuffer.append(packPath).append('/').append(JavadocConstants.PACKAGE_FILE_NAME);
 
 	if (monitor != null && monitor.isCanceled()) throw new OperationCanceledException();
-	String contents = null;
-	try {
-		contents = getURLContents(String.valueOf(pathBuffer));
-	} catch(JavaModelException jme) {
-		if (!(jme.getCause() instanceof FileNotFoundException)) {
-			throw jme;
-		}
-	}
+	String contents = getURLContents(String.valueOf(pathBuffer));
 	if (monitor != null && monitor.isCanceled()) throw new OperationCanceledException();
 	if (contents == null) return null;