[jboss-cvs] JBossAS SVN: r97047 - projects/fresh/trunk/fresh-deployers/src/main/java/org/jboss/fresh/deployers/exe.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-11-26 14:40:25 -0500 (Thu, 26 Nov 2009)
New Revision: 97047

Modified:
   projects/fresh/trunk/fresh-deployers/src/main/java/org/jboss/fresh/deployers/exe/ExecutableClassesDeployer.java
Log:
Don't hold empty executables.

Modified: projects/fresh/trunk/fresh-deployers/src/main/java/org/jboss/fresh/deployers/exe/ExecutableClassesDeployer.java
===================================================================
--- projects/fresh/trunk/fresh-deployers/src/main/java/org/jboss/fresh/deployers/exe/ExecutableClassesDeployer.java	2009-11-26 19:19:40 UTC (rev 97046)
+++ projects/fresh/trunk/fresh-deployers/src/main/java/org/jboss/fresh/deployers/exe/ExecutableClassesDeployer.java	2009-11-26 19:40:25 UTC (rev 97047)
@@ -41,6 +41,9 @@
  */
 public class ExecutableClassesDeployer extends PickupExecutablesDeployer<Module>
 {
+   /** The executables attachment key */
+   private static final String KEY = Executable.class.getName() + "s";
+
    public ExecutableClassesDeployer(ExecutableRegistry registry)
    {
       super(registry, Module.class);
@@ -50,17 +53,23 @@
    {
       ExecutableClassVisitor visitor = new ExecutableClassVisitor();
       module.visit(visitor);
-      unit.addAttachment(Executable.class.getName() + "s", visitor.getExecutables());
+      Set<Class<?>> executables = visitor.getExecutables();
+      if (executables.isEmpty() == false)
+      {
+         unit.addAttachment(KEY, executables);
+      }
    }
 
    @SuppressWarnings({"unchecked"})
-   @Override
    public void undeploy(DeploymentUnit unit, Module deployment)
    {
-      Set<Class<?>> executables = unit.getAttachment(Executable.class.getName() + "s", Set.class);
-      for (Class<?> clazz : executables)
+      Set<Class<?>> executables = unit.getAttachment(KEY, Set.class);
+      if (executables != null)
       {
-         getRegistry().unregisterExecutable(clazz);
+         for (Class<?> clazz : executables)
+         {
+            getRegistry().unregisterExecutable(clazz);
+         }
       }
    }