You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/01/17 09:32:03 UTC

git commit: WICKET-4968 NPE in FencedFeedbackPanel#onRemove

Updated Branches:
  refs/heads/master af3f84485 -> e37a9e101


WICKET-4968 NPE in FencedFeedbackPanel#onRemove


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e37a9e10
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e37a9e10
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e37a9e10

Branch: refs/heads/master
Commit: e37a9e101f6ee74aa03bff9a6797a16d304b3d0c
Parents: af3f844
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jan 17 10:31:34 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jan 17 10:31:34 2013 +0200

----------------------------------------------------------------------
 .../wicket/feedback/FencedFeedbackPanel.java       |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/e37a9e10/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java b/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
index 9b60ea1..f6916f2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
@@ -152,7 +152,7 @@ public class FencedFeedbackPanel extends FeedbackPanel
 			// decrement the fence count
 
 			Integer count = fence.getMetaData(FENCE_KEY);
-			count = count == 1 ? null : count - 1;
+			count = (count == null || count == 1) ? null : count - 1;
 			fence.setMetaData(FENCE_KEY, count);
 		}
 	}