From 58f7aedfaee34aa257efb073bf2ca3e94c30e75a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 30 Sep 2011 08:40:58 +0200 Subject: [PATCH] fix possible NullPointerException --- .../scm/repository/ChangesetViewerUtil.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/repository/ChangesetViewerUtil.java b/scm-core/src/main/java/sonia/scm/repository/ChangesetViewerUtil.java index ec73339a22..8f12bde687 100644 --- a/scm-core/src/main/java/sonia/scm/repository/ChangesetViewerUtil.java +++ b/scm-core/src/main/java/sonia/scm/repository/ChangesetViewerUtil.java @@ -164,13 +164,20 @@ public class ChangesetViewerUtil extends CacheClearHook { result = viewer.getChangesets(start, max); - if (Util.isNotEmpty(result.getChangesets())) + if (result != null) { - callPreProcessors(result); - callPreProcessorFactories(repository, result); - } + if (Util.isNotEmpty(result.getChangesets())) + { + callPreProcessors(result); + callPreProcessorFactories(repository, result); + } - cache.put(key, result); + cache.put(key, result); + } + else + { + throw new RepositoryException("could not fetch changesets"); + } } else if (logger.isDebugEnabled()) {