[109953] NPE's during JSP reconcile/validation - correct fix
diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/reconcile/ReconcileStepForJspTranslation.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/reconcile/ReconcileStepForJspTranslation.java
index 6d20fed..e4618a3 100644
--- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/reconcile/ReconcileStepForJspTranslation.java
+++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/reconcile/ReconcileStepForJspTranslation.java
@@ -71,24 +71,30 @@
*/
protected IReconcileResult[] reconcileModel(DirtyRegion dirtyRegion, IRegion subRegion) {
- if (DEBUG)
- System.out.println("[trace reconciler] > translating JSP in JSP TRANSLATE step"); //$NON-NLS-1$
- if (isCanceled() || dirtyRegion == null)
- return EMPTY_RECONCILE_RESULT_SET;
-
- // create java model for java reconcile
- JSPTranslationAdapter adapter = getJSPTranslationAdapter();
- if (adapter != null) {
- fJSPTranslation = adapter.getJSPTranslation();
- fModel = new JSPTranslationWrapper(fJSPTranslation);
-
- if (DEBUG) {
- System.out.println("[trace reconciler] > JSP TRANSLATE step done"); //$NON-NLS-1$
- }
- return EMPTY_RECONCILE_RESULT_SET;
+ IReconcileResult[] result = EMPTY_RECONCILE_RESULT_SET;
+ if (DEBUG) {
+ System.out.println("[trace reconciler] > translating JSP in JSP TRANSLATE step"); //$NON-NLS-1$
}
- return adaptELProblems();
+
+ if (!(isCanceled() || dirtyRegion == null)) {
+
+ // create java model for java reconcile
+ JSPTranslationAdapter adapter = getJSPTranslationAdapter();
+
+ if (adapter != null) {
+
+ fJSPTranslation = adapter.getJSPTranslation();
+ fModel = new JSPTranslationWrapper(fJSPTranslation);
+
+ result = adaptELProblems();
+ }
+ }
+ if (DEBUG) {
+ System.out.println("[trace reconciler] > JSP TRANSLATE step done"); //$NON-NLS-1$
+ }
+
+ return result;
}
private IReconcileResult[] adaptELProblems() {