Build fix

- remove merge issues that causes a double bootstrap
- move bootstrap bean into the correct context

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java

@@ -989,11 +989,13 @@ public class SchemaBootstrap extends AbstractLifecycleBean
                 // thrown.  If it is thrown, the the update needs to be rerun as it will probably generate no SQL
                 // statements the second time around.
                 boolean updatedSchema = false;
+                boolean createdSchema = false;
+                
                 for (int i = 0; i < schemaUpdateLockRetryCount; i++)
                 {
                     try
                     {
-                        updateSchema(cfg, session, connection);
+                        createdSchema = updateSchema(cfg, session, connection);
                         updatedSchema = true;
                         break;
                     }
@@ -1009,8 +1011,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
                     throw new AlfrescoRuntimeException(ERR_PREVIOUS_FAILED_BOOTSTRAP);
                 }
                 
-                boolean create = updateSchema(cfg, session, connection);
-                
                 // Copy the executed statements to the output file
                 File schemaOutputFile = null;
                 if (schemaOuputFilename != null)
@@ -1035,7 +1035,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
                     LogUtil.info(logger, MSG_ALL_STATEMENTS, schemaOutputFile.getPath());
                 }
                 
-                if (! create)
+                if (! createdSchema)
                 {
                     // verify that all patches have been applied correctly 
                     checkSchemaPatchScripts(cfg, session, connection, validateUpdateScriptPatches, false);  // check scripts