diff options
| author | Stephan Herrmann | 2018-02-11 14:25:39 -0500 |
|---|---|---|
| committer | Stephan Herrmann | 2018-02-12 18:51:21 -0500 |
| commit | d7490ab9200859ac8c944ed8e5c7e2343b0aca0b (patch) | |
| tree | 3b4999bdf215f06a8b43ef12e20471bd55303e7e | |
| parent | 4fcf908951f1ddb31590585a98bc84a8011624c8 (diff) | |
| download | org.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
cherry-pick of commit 09f9c3acff9a9b9ed8e232c9ded7be8179efd2d8
| -rw-r--r-- | org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/statemachine/transformer/SwitchOnBaseTypeGenerator.java | 2 |
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) |