opendev/gerrit
Code Issues Proposed changes

Prevent possible NPE in ChangeHookRunner.runHook()

Browse Source 
Also fix spelling in comments.

Change-Id: Ifc3b171c877c99a2256af13efa5259edfd7c980e
This commit is contained in:
David Pursehouse
2013-08-23 15:16:39 +09:00
parent e850ef5271
commit e4104434f2
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java
View File

@@ -811,23 +811,25 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
}
}
final int exitValue = result.getExitValue();
if (exitValue == 0) {
log.debug("hook[" + getName() + "] exitValue:" + exitValue);
} else {
log.info("hook[" + getName() + "] exitValue:" + exitValue);
}
BufferedReader br =
new BufferedReader(new StringReader(result.getOutput()));
try {
String line;
while ((line = br.readLine()) != null) {
log.info("hook[" + getName() + "] output: " + line);
if (result != null) {
final int exitValue = result.getExitValue();
if (exitValue == 0) {
log.debug("hook[" + getName() + "] exitValue:" + exitValue);
} else {
log.info("hook[" + getName() + "] exitValue:" + exitValue);
}
BufferedReader br =
new BufferedReader(new StringReader(result.getOutput()));
try {
String line;
while ((line = br.readLine()) != null) {
log.info("hook[" + getName() + "] output: " + line);
}
}
catch(IOException iox) {
log.error("Error writing hook output", iox);
}
}
catch(IOException iox) {
log.error("Error writing hook output", iox);
}
return result;
@@ -873,7 +875,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
}
}
/** Runable type used to run async hooks */
/** Runnable type used to run asynchronous hooks */
private final class AsyncHookTask extends HookTask implements Runnable {
private AsyncHookTask(Project.NameKey project, File hook, List<String> args) {