opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  Revert "Migrate from old-style legacy .java provider to the new JavaInfo."
  Catch all exceptions for reporting on Schema_130 migration
  Migrate from old-style legacy .java provider to the new JavaInfo.

Change-Id: I8fe109677bfa32c4fccceef28ff234d666d90c24
This commit is contained in:
David Pursehouse
2019-08-14 15:06:36 +09:00
parent 982d6e71c0 09f5f3bc81
commit c84140787e
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/server/schema/Schema_130.java
View File

@@ -25,10 +25,8 @@ import com.google.gerrit.server.git.meta.MetaDataUpdate;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import java.io.IOException;
import java.util.SortedSet;
import java.util.TreeSet;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Repository;
@@ -66,7 +64,7 @@ public class Schema_130 extends SchemaVersion {
repoUpgraded.add(projectName);
}
cfg.save(serverUser, COMMIT_MSG);
} catch (ConfigInvalidException | IOException ex) {
} catch (Exception ex) {
throw new OrmException("Cannot migrate project " + projectName, ex);
}
}