You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/01/22 23:42:48 UTC
git commit: ISIS-637: fixing NPE if in edit mode.
Updated Branches:
refs/heads/master 6b497b0ca -> a6aafd316
ISIS-637: fixing NPE if in edit mode.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a6aafd31
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a6aafd31
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a6aafd31
Branch: refs/heads/master
Commit: a6aafd316d63429c1b8e03d631466e82abf59608
Parents: 6b497b0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jan 22 22:38:29 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jan 22 22:38:29 2014 +0000
----------------------------------------------------------------------
.../components/widgets/entitylink/EntityLinkSelect2Panel.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a6aafd31/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
index ea2550a..36d3861 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.java
@@ -99,7 +99,10 @@ public class EntityLinkSelect2Panel extends FormComponentPanelAbstract<ObjectAda
*/
@Override
public boolean checkRequired() {
- return select2Field.checkRequired();
+ if(select2Field != null) {
+ return select2Field.checkRequired();
+ }
+ return super.checkRequired();
}
@Override