Bug 364667 - NullPointerException occurs when I try to display attributes for an HTML element in Web Page Editor
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySource.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySource.java
index b96a834..026a5d4 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySource.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySource.java
@@ -241,11 +241,13 @@
// }
private IPropertyDescriptor getAttrPropertyDescriptor(String attrName){
- Entity attrEntity = _query.findTagAttributeEntity(_tagEntity, attrName);
- List ppds = MetaDataEnabledProcessingFactory.getInstance().getAttributeValueRuntimeTypeFeatureProcessors(IPropertyPageDescriptor.class, _context, attrEntity);
- if (ppds.size() > 0)
- return (IPropertyDescriptor)((IPropertyPageDescriptor)ppds.get(0)).getAdapter(IPropertyDescriptor.class);
-
+ //Bug 364667 - NullPointerException occurs when I try to display attributes for an HTML element in Web Page Editor
+ if (_query != null) {
+ Entity attrEntity = _query.findTagAttributeEntity(_tagEntity, attrName);
+ List ppds = MetaDataEnabledProcessingFactory.getInstance().getAttributeValueRuntimeTypeFeatureProcessors(IPropertyPageDescriptor.class, _context, attrEntity);
+ if (ppds.size() > 0)
+ return (IPropertyDescriptor)((IPropertyPageDescriptor)ppds.get(0)).getAdapter(IPropertyDescriptor.class);
+ }
return null;
}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/WPETabbedPropertySheetPage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/WPETabbedPropertySheetPage.java
index 75b91cb..c0a956d 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/WPETabbedPropertySheetPage.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/WPETabbedPropertySheetPage.java
@@ -199,9 +199,12 @@
public void dispose() {
this.getSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(getSelectionListener());
this.getSite().setSelectionProvider(null);
- manager.releaseInstance();
- manager.dispose();
- manager = null;
+ //manager could be null here
+ if (manager != null) {
+ manager.releaseInstance();
+ manager.dispose();
+ manager = null;
+ }
_selListener = null;
_htmlEditor = null;
super.dispose();
