Превышено время ожидания блокировки после перехвата исключения внутри метода Transactional

Привет, У меня возникла проблема с запросом, который вызывает процедуру восстановления после Exception. Это код (основная его часть)

@Override
@Async
@Transactional(rollbackFor=Exception.class)
public void modifyFleet(User currentUser, FleetForm fleetForm) throws Exception {
    //Keep the progress status on DB
    fleetServices.setEditingProgress(fleetForm.getIdFleet(), "Start editing fleet");
    Fleet oldFleet = fleetServices.findById(fleetForm.getIdFleet());
    //some INSTRUCTIONS
    if (!(backupFolderFile.mkdirs()))
        throw new FileSystemException("Error making the folder backup");
    try{
        //Keep the progress status on DB
        fleetServices.setEditingProgress(fleetForm.getIdFleet(), "Backup...");
        FileUtils.copyDirectory(fleetFile, new File(backupFolder));

        //Create fleet with new value
        Fleet newFleet = newFleetConstructor(fleetForm, oldFleet);
        //Change operation for all cars of the application
        int i = 0;
        for (Car car:oldFleet.getCars()){
            //some INSTRUCTIONS

            //Keep the progress status on DB
            fleetServices.setEditingProgress(fleetForm.getIdFleet(), "Work on car "+ car.getCarType().getIdCarType() + car.getId()+ " (" + i +" of " + oldFleet.getCars().size() +"): Editing acquisitions file"  );

        }

        fleetServices.setEditingProgress(oldFleet.getIdFleet(), "Updating file system fleet path");
        utils.unSetEditingFleet(oldFleet.getIdFleet());
//          throw new Exception("fleet has been restored Exception");
    }catch(Exception e){
        //Keep the progress status on DB
        fleetServices.setEditingProgress(oldFleet.getIdFleet(), "Sorry an error occured during the procedure, wait until restore is ended!");
        //Restore the file system procedure
        restoreProcedure(oldFleet.getIdFleet(), fleetFile, backupFolderFile);       
        //Keep the progress status on DB
        fleetServices.setEditingProgress(oldFleet.getIdFleet(), "");
        utils.unSetEditingFleet(oldFleet.getIdFleet());
        //Even with this exception set the fleet as not in editing
        throw new EditingException("fleet has been restored!");
    }
}

Чтобы попробовать, что произойдет, когда excepton происходит во время unSetEditingFleet, я бросаю новое исключение:

@Transactional
public void unSetEditingFleet(Integer idFleet) throws QueryException {
    try {
        fleetServices.setEditingFleet(idFleet, false);  
        throw new Exception();
//          for(Car car : carServices.findByFleetIdFleet(idFleet)){
//              carServices.setEditingCar(car.getIdCar(), false);   //Unset cars associated with the fleet 
//          }    
    }catch(Exception e){
        throw new QueryException(e);
    }
}

Исключение составляет команда fleetServices.setEditingProgress после исключения Exception:

Caused by: java.sql.SQLException: Lock wait timeout exceeded; try restarting transaction
    at com.mysql.jdbc.SQLError.createSQLException(SQLError.java:998)
    at com.mysql.jdbc.MysqlIO.checkErrorPacket(MysqlIO.java:3847)
    at com.mysql.jdbc.MysqlIO.checkErrorPacket(MysqlIO.java:3783)
    at com.mysql.jdbc.MysqlIO.sendCommand(MysqlIO.java:2447)
    at com.mysql.jdbc.MysqlIO.sqlQueryDirect(MysqlIO.java:2594)
    at com.mysql.jdbc.ConnectionImpl.execSQL(ConnectionImpl.java:2545)
    at com.mysql.jdbc.PreparedStatement.executeInternal(PreparedStatement.java:1901)
    at com.mysql.jdbc.PreparedStatement.executeUpdate(PreparedStatement.java:2113)
    at com.mysql.jdbc.PreparedStatement.executeUpdate(PreparedStatement.java:2049)
    at com.mysql.jdbc.PreparedStatement.executeUpdate(PreparedStatement.java:2034)
    at org.apache.commons.dbcp.DelegatingPreparedStatement.executeUpdate(DelegatingPreparedStatement.java:105)
    at org.apache.commons.dbcp.DelegatingPreparedStatement.executeUpdate(DelegatingPreparedStatement.java:105)
    at org.hibernate.engine.jdbc.internal.ResultSetReturnImpl.executeUpdate(ResultSetReturnImpl.java:208)
    ... 54 more 

код setEditinProgress следующий:

@Override
@Transactional(propagation = Propagation.REQUIRES_NEW) //necessary to set immediately the text into the database inside a transactional method. This annotation create a new transaction
public void setEditingProgress(Integer idFleet, String editingProgress) {
    fleetRepository.setEditingProgress(idFleet, editingProgress);   
}

Это задает в базу данных статус выполнения операции, чтобы пользователь мог узнать статус выполнения. Почему только после улова я получаю это исключение? Знаете ли вы, как я могу это исправить?