opendev/gerrit
Code Issues Proposed changes

Fix potential null binding of sitePath

Browse Source 
When '-d' parameter of site init program is not provided the setter of
sitePath variable is not called. This leads to binding null value to
Path object annotated with @SitePath.

Simple initialization of sitePath with Paths.get(".") fixes this issue

Bug: issue 3212
Change-Id: I009ac28c22e9c092709ac4448ff8fc3f49a64a8c
Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
This commit is contained in:
Dariusz Luksza
2015-03-04 17:27:15 +01:00
committed by David Pursehouse
parent 6dcf6712a5
commit d6dc573586
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
View File

@@ -74,7 +74,7 @@ public abstract class SiteProgram extends AbstractProgram {
protected Provider<DataSource> dsProvider; protected Provider<DataSource> dsProvider;
private Path sitePath; private Path sitePath = Paths.get(".");
protected SiteProgram() { protected SiteProgram() {
} }
@@ -193,7 +193,7 @@ public abstract class SiteProgram extends AbstractProgram {
Module m = new AbstractModule() { Module m = new AbstractModule() {
@Override @Override
protected void configure() { protected void configure() {
bind(Path.class).annotatedWith(SitePath.class).toInstance(sitePath); bind(Path.class).annotatedWith(SitePath.class).toInstance(getSitePath());
bind(SitePaths.class); bind(SitePaths.class);
} }
}; };
@@ -225,7 +225,7 @@ public abstract class SiteProgram extends AbstractProgram {
modules.add(new AbstractModule() { modules.add(new AbstractModule() {
@Override @Override
protected void configure() { protected void configure() {
bind(Path.class).annotatedWith(SitePath.class).toInstance(sitePath); bind(Path.class).annotatedWith(SitePath.class).toInstance(getSitePath());
} }
}); });
modules.add(new GerritServerConfigModule()); modules.add(new GerritServerConfigModule());