[jboss-cvs] JBossAS SVN: r100335 - in projects/kernel/branches/resolver: dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 3 05:48:26 EST 2010
Author: kabir.khan at jboss.com
Date: 2010-02-03 05:48:25 -0500 (Wed, 03 Feb 2010)
New Revision: 100335
Modified:
projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/AbstractDependencyResolverMatcher.java
projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/IndexingDependencyResolver.java
projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/NameDependencyResolverMatcher.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/AbstractClassDependencyResolverMatcher.java
projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/SupplyDemandDependencyResolverMatcher.java
Log:
Don't throw error on uninstall, this fixes all the tests
Modified: projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2010-02-03 10:29:32 UTC (rev 100334)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2010-02-03 10:48:25 UTC (rev 100335)
@@ -1042,7 +1042,6 @@
*/
protected void resolveContexts(ControllerContext context, boolean trace)
{
- System.out.println("========= " + this + " - Resolve Contexts " + context);
dependencyResolver.resolveContexts(context, trace);
}
Modified: projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/AbstractDependencyResolverMatcher.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/AbstractDependencyResolverMatcher.java 2010-02-03 10:29:32 UTC (rev 100334)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/AbstractDependencyResolverMatcher.java 2010-02-03 10:48:25 UTC (rev 100335)
@@ -45,11 +45,6 @@
return item.getDependentState();
}
- protected void handleCleanUpError(DependencyItem item)
- {
- throw new IllegalStateException("Inconsistent state cleaning up " + item);
- }
-
/**
* Lock for read
*/
Modified: projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/IndexingDependencyResolver.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/IndexingDependencyResolver.java 2010-02-03 10:29:32 UTC (rev 100334)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/IndexingDependencyResolver.java 2010-02-03 10:48:25 UTC (rev 100335)
@@ -155,6 +155,7 @@
@Override
public void registerDependency(ControllerContext context, DependencyItem item)
{
+ System.out.println("-------> Register dependency " + item + " in " + getController());
DependencyResolverMatcher matcher = getMatcherForDependencyItem(item);
matcher.registerDependency(context, item.getClass().cast(item));
@@ -164,6 +165,7 @@
@Override
public void unregisterDependency(ControllerContext context, DependencyItem item)
{
+ System.out.println("-------> Unregister dependency " + item + " in " + getController());
DependencyResolverMatcher matcher = getMatcherForDependencyItem(item);
matcher.unregisterDependency(context, item);
flushJBossObjectCache();
@@ -251,7 +253,6 @@
@Override
public void stateIncremented(ControllerContext incremented, boolean trace)
{
- System.out.println("--------------> State incremented for " + incremented.getName() + " " + incremented.getState().getStateString() + " " + getController());
Set<ControllerContext> contexts = getAllContextsDependentOn(incremented);
if (contexts != null && contexts.size() > 0)
{
Modified: projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/NameDependencyResolverMatcher.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/NameDependencyResolverMatcher.java 2010-02-03 10:29:32 UTC (rev 100334)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/NameDependencyResolverMatcher.java 2010-02-03 10:48:25 UTC (rev 100335)
@@ -122,13 +122,6 @@
{
IndexingDependencyResolver resolver = (IndexingDependencyResolver)controller.getDependencyResolver();
aliases = resolver.getAliases(context.getName());
-// if (aliases != null && aliases.size() > 0)
-// {
-// for (Object alias : aliases)
-// {
-// result = addContextsDependentOn(result, alias, contextsByName);
-// }
-// }
result = addAliasContexts(result, contextsByName, aliases);
controller = controller.getParentController();
}
@@ -246,12 +239,12 @@
Map<Object, Set<ControllerContext>> contextsByName = contextsByState.get(getDependentState(item));
if (contextsByName == null)
- handleCleanUpError(item);
+ return;
Set<ControllerContext> contexts = contextsByName.get(name);
if (contexts == null)
- handleCleanUpError(item);
+ return;
if (!contexts.remove(owner))
- handleCleanUpError(item);
+ return;
flushJBossObjectCache();
}
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/AbstractClassDependencyResolverMatcher.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/AbstractClassDependencyResolverMatcher.java 2010-02-03 10:29:32 UTC (rev 100334)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/AbstractClassDependencyResolverMatcher.java 2010-02-03 10:48:25 UTC (rev 100335)
@@ -135,16 +135,15 @@
{
Map<Class<?>, Set<ControllerContext>> contextsByClass = contextsByState.get(getDependentState(item));
if (contextsByClass == null)
- handleCleanUpError(item);
-
+ return;
//Return if dependency has been unset
if (getDependencyClass(item) == null)
return;
Set<ControllerContext> contexts = contextsByClass.get(getDependencyClass(item));
if (contexts == null)
- handleCleanUpError(item);
+ return;
if (!contexts.remove(owner))
- handleCleanUpError(item);
+ return;
flushJBossObjectCache();
}
Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/SupplyDemandDependencyResolverMatcher.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/SupplyDemandDependencyResolverMatcher.java 2010-02-03 10:29:32 UTC (rev 100334)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/SupplyDemandDependencyResolverMatcher.java 2010-02-03 10:48:25 UTC (rev 100335)
@@ -91,9 +91,9 @@
{
Set<ControllerContext> contexts = contextsByState.get(getDependentState(item));
if (contexts == null)
- handleCleanUpError(item);
+ return;
if (!contexts.remove(owner))
- handleCleanUpError(item);
+ return;
}
finally
{
More information about the jboss-cvs-commits
mailing list