diff options
| author | Sergey Prigogin | 2017-04-16 19:33:34 +0000 |
|---|---|---|
| committer | Sergey Prigogin | 2017-04-16 19:33:34 +0000 |
| commit | 908a609a53d2a1d171e74b93ad19e7727f891edb (patch) | |
| tree | 2c6e84537cdedf4138f1fa527a05d2bdf285b31b /core/org.eclipse.cdt.ui/src/org/eclipse | |
| parent | 593dc77b6d88ba4f04e0dd4f7e90cfd6b28b9e3f (diff) | |
| download | org.eclipse.cdt-908a609a53d2a1d171e74b93ad19e7727f891edb.tar.gz org.eclipse.cdt-908a609a53d2a1d171e74b93ad19e7727f891edb.tar.xz org.eclipse.cdt-908a609a53d2a1d171e74b93ad19e7727f891edb.zip | |
Bug 514950 - NullPointerException running Organize Includes
Change-Id: Ic851d389a28e838775f20879bb88ffe00b9b55c0
Diffstat (limited to 'core/org.eclipse.cdt.ui/src/org/eclipse')
| -rw-r--r-- | core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java index 17f52971b9a..d2071d2d6bb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java @@ -1236,7 +1236,9 @@ public class BindingClassifier { } else if (binding instanceof ICPPTemplateParameter) { newBindings.add(binding); } else if (binding instanceof ICPPUnknownBinding) { - newBindings.add(binding.getOwner()); + IBinding owner = binding.getOwner(); + if (owner != null) + newBindings.add(owner); } else if (binding instanceof ICPPMethod) { newBindings.add(binding); // Include the method in case we need its inline definition. if (binding instanceof ICPPConstructor) |