You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2012/01/01 15:00:20 UTC
[1/2] git commit: DELTASPIKE-24 cleanup
Updated Branches:
refs/heads/master 206ef0c25 -> c0025b033
DELTASPIKE-24 cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/c0025b03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/c0025b03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/c0025b03
Branch: refs/heads/master
Commit: c0025b0335d8af8e75796c6ef2a92570b9a5bd0c
Parents: ea02df3
Author: gpetracek <gp...@apache.org>
Authored: Sun Jan 1 14:58:33 2012 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Sun Jan 1 14:58:33 2012 +0100
----------------------------------------------------------------------
.../core/impl/util/ClassDeactivation.java | 38 +++-----------
1 files changed, 8 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/c0025b03/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ClassDeactivation.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ClassDeactivation.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ClassDeactivation.java
index d8e5fd2..46b53f4 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ClassDeactivation.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ClassDeactivation.java
@@ -18,7 +18,6 @@
*/
package org.apache.deltaspike.core.impl.util;
-import org.apache.deltaspike.core.api.activation.AbstractClassDeactivator;
import org.apache.deltaspike.core.api.activation.ClassDeactivator;
import org.apache.deltaspike.core.api.config.ConfigResolver;
import org.apache.deltaspike.core.api.util.ClassUtils;
@@ -53,7 +52,7 @@ public final class ClassDeactivation
if (classDeactivator == null)
{
- classDeactivator = getClassDeactivator();
+ classDeactivator = resolveAndCacheClassDeactivator();
}
boolean classDeactivated = classDeactivator.getDeactivatedClasses().contains(targetClass);
@@ -71,25 +70,15 @@ public final class ClassDeactivation
ClassDeactivatorStorage.setClassDeactivator(classDeactivator);
}
- private static ClassDeactivator getClassDeactivator()
+ private static ClassDeactivator resolveAndCacheClassDeactivator()
{
ClassDeactivator classDeactivator = getConfiguredClassDeactivator();
- // use default deactivator
- if (classDeactivator == null)
+ // display deactivated classes here once
+ // NOTE that isClassActivated() will be called many times for the same class
+ for (Class<?> deactivatedClass : classDeactivator.getDeactivatedClasses())
{
- classDeactivator = createClassDeactivatorPlaceholder();
- }
- else
- {
- LOG.info("used class deactivator: " + classDeactivator.toString());
-
- // display deactivated classes here once
- // NOTE that isClassActivated() will be called many times for the same class
- for (Class<?> deactivatedClass : classDeactivator.getDeactivatedClasses())
- {
- LOG.info("deactivate: " + deactivatedClass);
- }
+ LOG.info("deactivate: " + deactivatedClass);
}
ClassDeactivatorStorage.setClassDeactivator(classDeactivator);
@@ -104,6 +93,8 @@ public final class ClassDeactivation
ClassDeactivator currentClassDeactivator;
for(String classDeactivatorClassName : classDeactivatorClassNames)
{
+ LOG.info(classDeactivatorClassName + " gets processed");
+
currentClassDeactivator =
ClassUtils.tryToInstantiateClassForName(classDeactivatorClassName, ClassDeactivator.class);
@@ -119,17 +110,4 @@ public final class ClassDeactivation
return new DefaultClassDeactivator(deactivatedClasses);
}
-
- private static AbstractClassDeactivator createClassDeactivatorPlaceholder()
- {
- return new AbstractClassDeactivator()
- {
- private static final long serialVersionUID = 3365575383802245760L;
-
- protected void deactivateClasses()
- {
- //do nothing
- }
- };
- }
}