[jboss-cvs] JBossAS SVN: r100774 - in projects/kernel/trunk/dependency/src: test/java/org/jboss/test/dependency/controller/benchmark and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 9 14:17:40 EST 2010
Author: kabir.khan at jboss.com
Date: 2010-02-09 14:17:39 -0500 (Tue, 09 Feb 2010)
New Revision: 100774
Modified:
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/benchmark/AbstractSimpleBenchmark.java
projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/benchmark/SimpleBenchmarkWrongOrder.java
Log:
Undo previous commit it was against wrong JIRA issue
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2010-02-09 19:11:13 UTC (rev 100773)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2010-02-09 19:17:39 UTC (rev 100774)
@@ -1747,33 +1747,18 @@
}
/**
- * Get calbacks from context for the given state.
+ * Get calbacks from context.
*
* @param context current context
- * @param state the state
* @param isInstallPhase install or uninstall phase
- * @return callback items from dependency info or null if no items could be found
+ * @return callback items from dependency info
*/
- protected Set<CallbackItem<?>> getDependencyCallbacksForState(ControllerContext context, ControllerState state, boolean isInstallPhase)
+ protected Set<CallbackItem<?>> getDependencyCallbacks(ControllerContext context, boolean isInstallPhase)
{
DependencyInfo di = context.getDependencyInfo();
if (di != null)
{
- Set<CallbackItem<?>> items = isInstallPhase ? di.getInstallItems() : di.getUninstallItems();
- if (items == null || items.isEmpty())
- return null;
-
- Set<CallbackItem<?>> result = null;
- for (CallbackItem<?> item : items)
- {
- if (item.getWhenRequired().equals(state))
- {
- if (result == null)
- result = new HashSet<CallbackItem<?>>();
- result.add(item);
- }
- }
- return result;
+ return isInstallPhase ? di.getInstallItems() : di.getUninstallItems();
}
return null;
}
@@ -1803,12 +1788,11 @@
/**
* Resolve callbacks.
*
- * @param callbacks the callbacks for the given state
+ * @param callbacks the callbacks
* @param state current context state
* @param execute do execute callback
* @param isInstallPhase install or uninstall phase
* @param type install or uninstall type
- * @throws IllegalStateException if the callbacks do not have the current context state
*/
protected void resolveCallbacks(Set<CallbackItem<?>> callbacks, ControllerState state, boolean execute, boolean isInstallPhase, boolean type)
{
@@ -1816,27 +1800,27 @@
{
for (CallbackItem<?> callback : callbacks)
{
- if (callback.getWhenRequired().equals(state) == false)
- throw new IllegalArgumentException(callback + " does not have the required state " + state);
-
- if (isInstallPhase)
+ if (callback.getWhenRequired().equals(state))
{
- addCallback(callback.getIDependOn(), type, callback);
- }
- else
- {
- removeCallback(callback.getIDependOn(), type, callback);
- }
- if (execute)
- {
- try
+ if (isInstallPhase)
{
- callback.ownerCallback(this, isInstallPhase);
+ addCallback(callback.getIDependOn(), type, callback);
}
- catch (Throwable t)
+ else
{
- log.warn("Broken callback: " + callback, t);
+ removeCallback(callback.getIDependOn(), type, callback);
}
+ if (execute)
+ {
+ try
+ {
+ callback.ownerCallback(this, isInstallPhase);
+ }
+ catch (Throwable t)
+ {
+ log.warn("Broken callback: " + callback, t);
+ }
+ }
}
}
}
@@ -1854,17 +1838,19 @@
ClassLoader previous = null;
try
{
+ previous = SecurityActions.setContextClassLoader(context);
// existing owner callbacks
- Set<CallbackItem<?>> installs = getDependencyCallbacksForState(context, state, true);
- Set<CallbackItem<?>> uninstalls = getDependencyCallbacksForState(context, state, false);
+ Set<CallbackItem<?>> installs = getDependencyCallbacks(context, true);
+ resolveCallbacks(installs, state, isInstallPhase, isInstallPhase, true);
+ Set<CallbackItem<?>> uninstalls = getDependencyCallbacks(context, false);
+ resolveCallbacks(uninstalls, state, isInstallPhase == false, isInstallPhase, false);
// change callbacks, applied only if context is autowire candidate
- Set<CallbackItem<?>> existingCallbacks = null;
DependencyInfo dependencyInfo = context.getDependencyInfo();
if (dependencyInfo != null && dependencyInfo.isAutowireCandidate())
{
// match callbacks by name
- existingCallbacks = new HashSet<CallbackItem<?>>();
+ Set<CallbackItem<?>> existingCallbacks = new HashSet<CallbackItem<?>>();
existingCallbacks.addAll(getCallbacks(context.getName(), isInstallPhase));
// match by classes
Collection<Class<?>> classes = getExposedClasses(context);
@@ -1875,36 +1861,22 @@
existingCallbacks.addAll(getCallbacks(clazz, isInstallPhase));
}
}
-
- if (existingCallbacks.isEmpty())
- existingCallbacks = null;
- }
-
- if (installs != null || uninstalls != null || existingCallbacks != null)
- {
- previous = SecurityActions.setContextClassLoader(context);
- if (installs != null)
- resolveCallbacks(installs, state, isInstallPhase, isInstallPhase, true);
- if (uninstalls != null)
- resolveCallbacks(uninstalls, state, isInstallPhase == false, isInstallPhase, false);
- if (existingCallbacks != null)
+
+ // Do the installs if we are at the required state
+ if (existingCallbacks != null && existingCallbacks.isEmpty() == false)
{
- // Do the installs if we are at the required state
- if (existingCallbacks != null && existingCallbacks.isEmpty() == false)
+ for(CallbackItem<?> callback : existingCallbacks)
{
- for(CallbackItem<?> callback : existingCallbacks)
+ if (state.equals(callback.getDependentState()))
{
- if (state.equals(callback.getDependentState()))
+ try
{
- try
- {
- callback.changeCallback(this, context, isInstallPhase);
- }
- catch (Throwable t)
- {
- log.warn("Broken callback: " + callback, t);
- }
+ callback.changeCallback(this, context, isInstallPhase);
}
+ catch (Throwable t)
+ {
+ log.warn("Broken callback: " + callback, t);
+ }
}
}
}
@@ -1921,7 +1893,7 @@
SecurityActions.resetContextClassLoader(previous);
}
}
-
+
/**
* Handle install lifecycle callbacks.
*
Modified: projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/benchmark/AbstractSimpleBenchmark.java
===================================================================
--- projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/benchmark/AbstractSimpleBenchmark.java 2010-02-09 19:11:13 UTC (rev 100773)
+++ projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/benchmark/AbstractSimpleBenchmark.java 2010-02-09 19:17:39 UTC (rev 100774)
@@ -34,7 +34,7 @@
*/
public abstract class AbstractSimpleBenchmark extends AbstractDependencyTest
{
- protected int iterations = 2000;
+ protected final int iterations = 2000;
public AbstractSimpleBenchmark(String name)
{
Modified: projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/benchmark/SimpleBenchmarkWrongOrder.java
===================================================================
--- projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/benchmark/SimpleBenchmarkWrongOrder.java 2010-02-09 19:11:13 UTC (rev 100773)
+++ projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/benchmark/SimpleBenchmarkWrongOrder.java 2010-02-09 19:17:39 UTC (rev 100774)
@@ -40,7 +40,6 @@
public SimpleBenchmarkWrongOrder(String name)
{
super(name);
- iterations = 500;
}
protected List<ControllerContext> setupContexts()
More information about the jboss-cvs-commits
mailing list