From 15e0e2b55a384638b12c5f247572ef922b48f9e5 Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Tue, 6 Sep 2011 21:56:46 +0000
Subject: [PATCH] ALF-10198: Module component execution passes installed
 version not current version at component start-up

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repo/module/ModuleComponentHelper.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/java/org/alfresco/repo/module/ModuleComponentHelper.java b/source/java/org/alfresco/repo/module/ModuleComponentHelper.java
index 04e7e86343..1e510e925f 100644
--- a/source/java/org/alfresco/repo/module/ModuleComponentHelper.java
+++ b/source/java/org/alfresco/repo/module/ModuleComponentHelper.java
@@ -561,7 +561,7 @@ public class ModuleComponentHelper
         Map<String, ModuleComponent> componentsByName = getComponents(moduleId);
         for (ModuleComponent component : componentsByName.values())
         {
-            executeComponent(moduleId, moduleInstallVersion, component, executedComponents);
+            executeComponent(moduleId, moduleNewVersion, component, executedComponents);
         }
         
         // Keep track of the ID as it started successfully
@@ -579,7 +579,7 @@ public class ModuleComponentHelper
      */
     private void executeComponent(
             String moduleId,
-            VersionNumber moduleInstallVersion,
+            VersionNumber currentVersion,
             ModuleComponent component,
             Set<ModuleComponent> executedComponents)
     {
@@ -600,7 +600,7 @@ public class ModuleComponentHelper
         // Check the version applicability
         VersionNumber minVersion = component.getAppliesFromVersionNumber();
         VersionNumber maxVersion = component.getAppliesToVersionNumber();
-        if (moduleInstallVersion.compareTo(minVersion) < 0 || moduleInstallVersion.compareTo(maxVersion) > 0)
+        if (currentVersion.compareTo(minVersion) < 0 || currentVersion.compareTo(maxVersion) > 0)
         {
             // It is out of the allowable range for execution so we just ignore it
             if (logger.isDebugEnabled())
@@ -608,7 +608,7 @@ public class ModuleComponentHelper
                 logger.debug("Skipping component that doesn't apply to the module installation version: \n" +
                         "   Component:       " + component + "\n" +
                         "   Module:          " + moduleId + "\n" +
-                        "   Install Version: " + moduleInstallVersion + "\n" +
+                        "   Current Version: " + currentVersion + "\n" +
                         "   Applies From :   " + minVersion + "\n" +
                         "   Applies To   :   " + maxVersion);
             }
@@ -639,7 +639,7 @@ public class ModuleComponentHelper
         List<ModuleComponent> dependencies = component.getDependsOn();
         for (ModuleComponent dependency : dependencies)
         {
-            executeComponent(moduleId, moduleInstallVersion, dependency, executedComponents);
+            executeComponent(moduleId, currentVersion, dependency, executedComponents);
         }
         // Execute the component itself
         component.execute();