You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2015/01/26 10:28:17 UTC
svn commit: r1654748 -
/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHelper.java
Author: stefanegli
Date: Mon Jan 26 09:28:17 2015
New Revision: 1654748
URL: http://svn.apache.org/r1654748
Log:
SLING-4224 : avoid a NPE happening after bundle deactivation
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHelper.java
Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHelper.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHelper.java?rev=1654748&r1=1654747&r2=1654748&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHelper.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHelper.java Mon Jan 26 09:28:17 2015
@@ -46,10 +46,14 @@ public class VotingHelper {
* <p>
* 'Not winning' means that a voting still did not receive a vote
* from everybody
- * @return the list of matching votings
+ * @return the list of matching votings - never returns null
*/
public static List<VotingView> listOpenNonWinningVotings(
final ResourceResolver resourceResolver, final Config config) {
+ if (config==null) {
+ logger.info("listOpenNonWinningVotings: config is null, bundle likely deactivated.");
+ return new ArrayList<VotingView>();
+ }
final String ongoingVotingsPath = config.getOngoingVotingsPath();
final Resource ongoingVotingsResource = resourceResolver
.getResource(ongoingVotingsPath);