Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2018-02-11 19:25:39 +0000
committerStephan Herrmann2018-02-12 23:51:21 +0000
commitd7490ab9200859ac8c944ed8e5c7e2343b0aca0b (patch)
tree3b4999bdf215f06a8b43ef12e20471bd55303e7e
parent4fcf908951f1ddb31590585a98bc84a8011624c8 (diff)
downloadorg.eclipse.objectteams-d7490ab9200859ac8c944ed8e5c7e2343b0aca0b.tar.gz
org.eclipse.objectteams-d7490ab9200859ac8c944ed8e5c7e2343b0aca0b.tar.xz
org.eclipse.objectteams-d7490ab9200859ac8c944ed8e5c7e2343b0aca0b.zip
Backport: Resilience: saw NPE caused by base class problem
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/statemachine/transformer/SwitchOnBaseTypeGenerator.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/statemachine/transformer/SwitchOnBaseTypeGenerator.java b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/statemachine/transformer/SwitchOnBaseTypeGenerator.java
index e97aefc92..a1e43364b 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/statemachine/transformer/SwitchOnBaseTypeGenerator.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/statemachine/transformer/SwitchOnBaseTypeGenerator.java
@@ -118,6 +118,8 @@ public abstract class SwitchOnBaseTypeGenerator implements IOTConstants {
*/
for (int idx = caseObjects.length-1; idx >= 0; idx--) {
RoleModel object = caseObjects[idx];
+ if (object.hasBaseclassProblem())
+ continue;
Statement s = (teamType.getTeamModel().isAmbiguousLifting(staticRoleType, object.getBaseTypeBinding()))
? createStatementForAmbiguousBase(gen)

Back to the top