diff options
author | itrimble | 2011-03-16 22:40:55 +0000 |
---|---|---|
committer | itrimble | 2011-03-16 22:40:55 +0000 |
commit | a84d575d55e804c9dc53f05a7ec67852e2a57fbc (patch) | |
tree | 5532385299275ad968ad0f36c0df8b957b960efb | |
parent | 49f78150b2ce433de3126cf730491555548ae7db (diff) | |
download | webtools.jsf-a84d575d55e804c9dc53f05a7ec67852e2a57fbc.tar.gz webtools.jsf-a84d575d55e804c9dc53f05a7ec67852e2a57fbc.tar.xz webtools.jsf-a84d575d55e804c9dc53f05a7ec67852e2a57fbc.zip |
Bug 254777 - NPE in faces config editor
-rw-r--r-- | jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java index 475cc036b..cfe4ed47a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java @@ -959,7 +959,12 @@ public class FacesConfigEditor extends FormEditor implements * @return - the <code>DelegatingZoomManager</code> */ protected DelegatingZoomManager getDelegatingZoomManager() { - if (!isValidInput(getEditorInput()) || !isWebProject || !_addPagesTask.getArePagesLoaded()) { + if ( + !isValidInput(getEditorInput()) || + !isWebProject || + _addPagesTask == null || + !_addPagesTask.getArePagesLoaded() || + pageflowPage == null) { return null; } if (null == delegatingZoomManager) { |