aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzzhongwei2013-01-16 21:31:19 (EST)
committerzzhongwei2013-01-16 21:31:19 (EST)
commitd6637a870803aad527386afc0aa3747c6cf97d56 (patch)
tree54a61f872b6bc0656657f62ab26ebe9868beea82
parentaa30168be7dc0ae4a70fd3ba6f91dc5d15e143d5 (diff)
downloadorg.eclipse.pdt-d6637a870803aad527386afc0aa3747c6cf97d56.zip
org.eclipse.pdt-d6637a870803aad527386afc0aa3747c6cf97d56.tar.gz
org.eclipse.pdt-d6637a870803aad527386afc0aa3747c6cf97d56.tar.bz2
396013: Random NullPointerException
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396013
-rw-r--r--plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/editor/PHPStructuredEditor.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/editor/PHPStructuredEditor.java b/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/editor/PHPStructuredEditor.java
index d88adca..18b5110 100644
--- a/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/editor/PHPStructuredEditor.java
+++ b/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/editor/PHPStructuredEditor.java
@@ -3151,8 +3151,10 @@ public class PHPStructuredEditor extends StructuredTextEditor implements
(ISourceModule) inputElement,
SharedASTProvider.WAIT_ACTIVE_ONLY,
new NullProgressMonitor());
- fOverrideIndicatorManager.reconciled(ast, true,
- getProgressMonitor());
+ if (fOverrideIndicatorManager != null) {
+ fOverrideIndicatorManager.reconciled(ast, true,
+ getProgressMonitor());
+ }
} catch (ModelException e) {
Logger.logException(e);
} catch (IOException e) {