From 652bed012c9fc75c909e31dd051035ecc79300d0 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Mon, 14 May 2007 16:03:34 +0000
Subject: [PATCH] Fixed AR-1425: Patches that weren't successfully executed are
 now re-examined for applicability. Changed the applicability version numbers
 of several patches that were merged over from V2.0.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5672 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/patch/patch-services-context.xml | 20 +++++++++----------
 .../repo/admin/patch/PatchServiceImpl.java    |  8 ++++++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 826cee884b..30fa729fda 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -521,8 +521,8 @@
         <property name="id"><value>patch.versionHistoryPerformance</value></property>
         <property name="description"><value>patch.versionHistoryPerformance.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>24</value></property>
-        <property name="targetSchema"><value>25</value></property>
+        <property name="fixesToSchema"><value>38</value></property>
+        <property name="targetSchema"><value>39</value></property>
         <property name="versionService">
             <ref bean="VersionService" />
         </property>
@@ -531,8 +531,8 @@
         <property name="id"><value>patch.db-V1.4-PostgresFKIndexes</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>21</value></property>
-        <property name="fixesToSchema"><value>24</value></property>
-        <property name="targetSchema"><value>25</value></property>
+        <property name="fixesToSchema"><value>51</value></property>
+        <property name="targetSchema"><value>52</value></property>
         <property name="scriptUrl">
             <value>classpath:alfresco/dbscripts/upgrade/1.4/${db.script.dialect}/AlfrescoSchemaUpdate-1.4-PostgresFKIndexes.sql</value>
         </property>
@@ -685,8 +685,8 @@
         <property name="id"><value>patch.groupNamesAsIdentifiers</value></property>
         <property name="description"><value>patch.groupNamesAsIdentifiers.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>38</value></property>
-        <property name="targetSchema"><value>39</value></property>
+        <property name="fixesToSchema"><value>51</value></property>
+        <property name="targetSchema"><value>52</value></property>
         <!-- bootstrap view -->
         <property name="userImporterBootstrap">
             <ref bean="userBootstrap" />
@@ -700,8 +700,8 @@
         <property name="id"><value>patch.invalidUserPersonAndGroup</value></property>
         <property name="description"><value>patch.invalidUserPersonAndGroup.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>39</value></property>
-        <property name="targetSchema"><value>40</value></property>
+        <property name="fixesToSchema"><value>51</value></property>
+        <property name="targetSchema"><value>52</value></property>
         <!-- bootstrap view -->
         <property name="userImporterBootstrap">
             <ref bean="userBootstrap" />
@@ -718,8 +718,8 @@
         <property name="id"><value>patch.AVMGuidPatch</value></property>
         <property name="description"><value>patch.AVMGuidPatch.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>50</value></property>
-        <property name="targetSchema"><value>51</value></property>
+        <property name="fixesToSchema"><value>51</value></property>
+        <property name="targetSchema"><value>52</value></property>
         <property name="avmNodeDao">
             <ref bean="avmNodeDAO"/>
         </property>
diff --git a/source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java b/source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java
index 09dd8cb2dd..e4ed3e73ad 100644
--- a/source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java
+++ b/source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java
@@ -163,8 +163,12 @@ public class PatchServiceImpl implements PatchService
         AppliedPatch appliedPatch = appliedPatchesById.get(id); 
         if (appliedPatch != null && appliedPatch.getSucceeded())
         {
-            // this has already been done
-            return true;
+            if (appliedPatch.getWasExecuted() && appliedPatch.getSucceeded())
+            {
+                // It was sucessfully executed
+                return true;
+            }
+            // We give the patch another chance
         }
         
         // ensure that dependencies have been done