[core] Avoid NPE in AgentTrait.

see #76 Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Nov 26, 2016 · 06ec111 · 06ec111
1 parent 50d3cf6
commit 06ec111
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/eclipse-sarl/plugins/io.sarl.lang.core/src/io/sarl/lang/core/AgentTrait.java b/eclipse-sarl/plugins/io.sarl.lang.core/src/io/sarl/lang/core/AgentTrait.java
@@ -102,11 +102,13 @@ protected final <S extends Capacity> S getSkill(Class<S> capacity) {
 	 */
 	@Pure
 	protected <S extends Capacity> S $castSkill(Class<S> capacity, ClearableReference<Skill> skillReference) {
-		final S skill = capacity.cast(skillReference.get());
-		if (skill == null) {
-			throw new UnimplementedCapacityException(capacity, getOwner().getID());
+		if (skillReference != null) {
+			final S skill = capacity.cast(skillReference.get());
+			if (skill != null) {
+				return skill;
+			}
 		}
-		return skill;
+		throw new UnimplementedCapacityException(capacity, getOwner().getID());
 	}
 
 	@Override