diff options
| author | marco <mw.sunshine@gmx.de> | 2015-10-17 13:48:03 +0200 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2015-11-23 13:58:14 -0500 |
| commit | 1aec17636d8c548257cb307f8cc1e41354e00421 (patch) | |
| tree | cbfee928075a8ffa5adfcb237d44eccb2f7dd0d0 /src/main/java/com/gitblit/manager/FederationManager.java | |
| parent | 66e081e2dcbca1524003a728d11e7f5ccbdb7bf1 (diff) | |
| download | gitblit-1aec17636d8c548257cb307f8cc1e41354e00421.tar.gz gitblit-1aec17636d8c548257cb307f8cc1e41354e00421.zip | |
Fix 2 possible NullPointer occurences
Diffstat (limited to 'src/main/java/com/gitblit/manager/FederationManager.java')
| -rw-r--r-- | src/main/java/com/gitblit/manager/FederationManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/com/gitblit/manager/FederationManager.java b/src/main/java/com/gitblit/manager/FederationManager.java index f009c1c8..8f68733b 100644 --- a/src/main/java/com/gitblit/manager/FederationManager.java +++ b/src/main/java/com/gitblit/manager/FederationManager.java @@ -367,6 +367,10 @@ public class FederationManager implements IFederationManager { && file.getName().toLowerCase().endsWith(Constants.PROPOSAL_EXT); } }); + if (files == null) { + return list; + } + for (File file : files) { String json = com.gitblit.utils.FileUtils.readContent(file, null); FederationProposal proposal = JsonUtils.fromJsonString(json, |