Merge "Use readFully() instead of read()"
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java index acbf3f1..4fe050b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java
@@ -202,8 +202,7 @@ public PullResult call() throws WrongRepositoryStateException, FetchCommand fetch = new FetchCommand(repo); fetch.setRemote(remote); - if (monitor != null) - fetch.setProgressMonitor(monitor); + fetch.setProgressMonitor(monitor); fetch.setTimeout(this.timeout); fetchRes = fetch.call();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreRule.java b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreRule.java index ac3ec66..b43b111 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreRule.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreRule.java
@@ -105,7 +105,7 @@ else if (!pattern.startsWith("/")) { if (pattern.contains("*") || pattern.contains("?") || pattern.contains("[")) { try { - matcher = new FileNameMatcher(pattern, new Character('/')); + matcher = new FileNameMatcher(pattern, Character.valueOf('/')); } catch (InvalidPatternException e) { e.printStackTrace(); }
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackOutputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackOutputStream.java index d812551..38f5e3a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackOutputStream.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackOutputStream.java
@@ -56,7 +56,7 @@ /** Custom output stream to support {@link PackWriter}. */ public final class PackOutputStream extends OutputStream { - private final int BYTES_TO_WRITE_BEFORE_CANCEL_CHECK = 128 * 1024; + private static final int BYTES_TO_WRITE_BEFORE_CANCEL_CHECK = 128 * 1024; private final ProgressMonitor writeMonitor;