opendev/gerrit
Code Issues Proposed changes

Update JGit to 0.5.0-57-g4c5eb17

Browse Source 
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-07-27 07:49:22 -07:00
parent 06e4ba375f
commit 0a3ac75205
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -253,7 +253,7 @@ limitations under the License.
</licenses> </licenses>
<properties> <properties>
<jgitVersion>0.5.0</jgitVersion> <jgitVersion>0.5.0-57-g4c5eb17</jgitVersion>
<gwtormVersion>1.1.1</gwtormVersion> <gwtormVersion>1.1.1</gwtormVersion>
<gwtjsonrpcVersion>1.1.0</gwtjsonrpcVersion> <gwtjsonrpcVersion>1.1.0</gwtjsonrpcVersion>
<gwtexpuiVersion>1.1.2</gwtexpuiVersion> <gwtexpuiVersion>1.1.2</gwtexpuiVersion>

4
src/main/java/com/google/gerrit/git/PushQueue.java
View File

@@ -23,6 +23,7 @@ import com.jcraft.jsch.Session;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.spearce.jgit.errors.ConfigInvalidException;
import org.spearce.jgit.lib.RepositoryConfig; import org.spearce.jgit.lib.RepositoryConfig;
import org.spearce.jgit.transport.OpenSshConfig; import org.spearce.jgit.transport.OpenSshConfig;
import org.spearce.jgit.transport.RefSpec; import org.spearce.jgit.transport.RefSpec;
@@ -157,6 +158,9 @@ public class PushQueue {
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
log.warn("No " + cfgFile + "; not replicating"); log.warn("No " + cfgFile + "; not replicating");
configs = Collections.emptyList(); configs = Collections.emptyList();
} catch (ConfigInvalidException e) {
log.error("Can't read " + cfgFile, e);
return Collections.emptyList();
} catch (IOException e) { } catch (IOException e) {
log.error("Can't read " + cfgFile, e); log.error("Can't read " + cfgFile, e);
return Collections.emptyList(); return Collections.emptyList();

3
src/main/java/com/google/gerrit/server/GerritServer.java
View File

@@ -65,6 +65,7 @@ import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply; import org.apache.commons.net.smtp.SMTPReply;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.spearce.jgit.errors.ConfigInvalidException;
import org.spearce.jgit.lib.PersonIdent; import org.spearce.jgit.lib.PersonIdent;
import org.spearce.jgit.lib.RepositoryConfig; import org.spearce.jgit.lib.RepositoryConfig;
import org.spearce.jgit.lib.WindowCache; import org.spearce.jgit.lib.WindowCache;
@@ -205,6 +206,8 @@ public class GerritServer {
gerritConfigFile.load(); gerritConfigFile.load();
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
log.info("No " + cfgLoc.getAbsolutePath() + "; assuming defaults"); log.info("No " + cfgLoc.getAbsolutePath() + "; assuming defaults");
} catch (ConfigInvalidException e) {
throw new OrmException("Cannot read " + cfgLoc.getAbsolutePath(), e);
} catch (IOException e) { } catch (IOException e) {
throw new OrmException("Cannot read " + cfgLoc.getAbsolutePath(), e); throw new OrmException("Cannot read " + cfgLoc.getAbsolutePath(), e);
} }