Bladeren bron

Handle null in ProgressMonitor setters

These commands' monitor fields can never be null unless someone passes
null to setProgressMonitor.  Anyone passing null probably meant to
disable the ProgressMonitor, so do that (by falling back to
NullProgressMonitor.INSTANCE) instead of saving a null and eventually
producing NullPointerException.

Change-Id: I63ad93ea8ad669fd333a5fd40880e7583ba24827
Signed-off-by: Jonathan Nieder <jrn@google.com>
tags/v4.1.0.201509280440-r
Jonathan Nieder 9 jaren geleden
bovenliggende
commit
bbfd9b0e5f

+ 3
- 0
org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java Bestand weergeven

* @return {@code this} * @return {@code this}
*/ */
public CloneCommand setProgressMonitor(ProgressMonitor monitor) { public CloneCommand setProgressMonitor(ProgressMonitor monitor) {
if (monitor == null) {
monitor = NullProgressMonitor.INSTANCE;
}
this.monitor = monitor; this.monitor = monitor;
return this; return this;
} }

+ 4
- 1
org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java Bestand weergeven

* @return this instance * @return this instance
*/ */
public DiffCommand setProgressMonitor(ProgressMonitor monitor) { public DiffCommand setProgressMonitor(ProgressMonitor monitor) {
if (monitor == null) {
monitor = NullProgressMonitor.INSTANCE;
}
this.monitor = monitor; this.monitor = monitor;
return this; return this;
} }
}
}

+ 3
- 0
org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java Bestand weergeven

*/ */
public FetchCommand setProgressMonitor(ProgressMonitor monitor) { public FetchCommand setProgressMonitor(ProgressMonitor monitor) {
checkCallable(); checkCallable();
if (monitor == null) {
monitor = NullProgressMonitor.INSTANCE;
}
this.monitor = monitor; this.monitor = monitor;
return this; return this;
} }

+ 3
- 0
org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java Bestand weergeven

* @return this instance * @return this instance
*/ */
public PullCommand setProgressMonitor(ProgressMonitor monitor) { public PullCommand setProgressMonitor(ProgressMonitor monitor) {
if (monitor == null) {
monitor = NullProgressMonitor.INSTANCE;
}
this.monitor = monitor; this.monitor = monitor;
return this; return this;
} }

+ 3
- 0
org.eclipse.jgit/src/org/eclipse/jgit/api/PushCommand.java Bestand weergeven

*/ */
public PushCommand setProgressMonitor(ProgressMonitor monitor) { public PushCommand setProgressMonitor(ProgressMonitor monitor) {
checkCallable(); checkCallable();
if (monitor == null) {
monitor = NullProgressMonitor.INSTANCE;
}
this.monitor = monitor; this.monitor = monitor;
return this; return this;
} }

+ 3
- 0
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java Bestand weergeven

* @return this instance * @return this instance
*/ */
public RebaseCommand setProgressMonitor(ProgressMonitor monitor) { public RebaseCommand setProgressMonitor(ProgressMonitor monitor) {
if (monitor == null) {
monitor = NullProgressMonitor.INSTANCE;
}
this.monitor = monitor; this.monitor = monitor;
return this; return this;
} }

Laden…
Annuleren
Opslaan