Javadoc clarification for recordClassDefinev20120227-2121

2 files changed, 15 insertions, 9 deletions

diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/hooks/ClassLoadingStatsHook.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/hooks/ClassLoadingStatsHook.java
index 26a84a160..726b923bc 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/hooks/ClassLoadingStatsHook.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/hooks/ClassLoadingStatsHook.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
+ * Copyright (c) 2006, 2012 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
@@ -66,10 +66,10 @@ public interface ClassLoadingStatsHook {
 	void postFindLocalResource(String name, URL resource, ClasspathManager manager);
 
 	/**
-	 * Gets called by a classpath manager after a successfully defining a class.  This method allows 
+	 * Gets called by a classpath manager after an attempt is made to define a class.  This method allows 
 	 * a class loading stat hook to record data about a class definition. 
 	 * @param name the name of the class that got defined
-	 * @param clazz the class object that got defined
+	 * @param clazz the class object that got defined or null if an error occurred while defining a class
 	 * @param classbytes the class bytes used to define the class
 	 * @param classpathEntry the ClasspathEntry where the class bytes got read from
 	 * @param entry the BundleEntyr source of the class bytes
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/loader/ClasspathManager.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/loader/ClasspathManager.java
index 4173da25e..bba55ad7b 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/loader/ClasspathManager.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/loader/ClasspathManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
+ * Copyright (c) 2005, 2012 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
@@ -437,11 +437,17 @@ public class ClasspathManager {
 	 * Finds a local class by searching the ClasspathEntry objects of the classpath manager.
 	 * This method will first call all the configured class loading stats hooks 
 	 * {@link ClassLoadingStatsHook#preFindLocalClass(String, ClasspathManager)} methods.  Then it 
-	 * will search for the class.  If a class is found then all configured class loading hooks
-	 * {@link ClassLoadingHook#processClass(String, byte[], ClasspathEntry, BundleEntry, ClasspathManager)}
-	 * methods will be called.  The class is then defined; if successfully then all configured class loading 
-	 * stats hooks {@link ClassLoadingStatsHook#recordClassDefine(String, Class, byte[], ClasspathEntry, BundleEntry, ClasspathManager)}
-	 * methods are called.  Finally all the configured class loading stats hooks
+	 * will search for the class.  If a class is found then
+	 * <ol>
+	 *   <li>All configured class loading hooks
+	 *       {@link ClassLoadingHook#processClass(String, byte[], ClasspathEntry, BundleEntry, ClasspathManager)}
+	 *       methods will be called.</li>
+	 *   <li>The class is then defined.</li>  
+	 *   <li>Finally, all configured class loading 
+	 *       stats hooks {@link ClassLoadingStatsHook#recordClassDefine(String, Class, byte[], ClasspathEntry, BundleEntry, ClasspathManager)}
+	 *       methods are called.</li>
+	 * </ol>
+	 * Finally all the configured class loading stats hooks
 	 * {@link ClassLoadingStatsHook#postFindLocalClass(String, Class, ClasspathManager)} methods are called.
 	 * @param classname the requested class name.
 	 * @return the requested class