commit 0c80d4ae347ecf4f2aa743e54474e5f20b8cc6df
author cbateman <cbateman> Wed May 19 18:12:41 2010 +0000
committer cbateman <cbateman> Wed May 19 18:12:41 2010 +0000
tree e998556c8dfa9d4e2d4a58921fe7ca30a5c31a8c
parent c04ff8d8dde01110a03ab14ceb928fcc7353c739

Fix for PMC_approved https://bugs.eclipse.org/bugs/show_bug.cgi?id=269069

jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java

diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java
index ae8e7b0..0b6015c 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java
@@ -274,12 +274,8 @@
             model.releaseFromRead();
         }
         
-        throw new CoreException
-            (new Status(IStatus.ERROR
-                        , "org.eclipse.blah" //$NON-NLS-1$
-                        , 0
-                        ,"model not of expected type" //$NON-NLS-1$
-                        , new Throwable()));
+        JSFCorePlugin.log("Couldn't get valid model for file: "+file.toString(), new Exception()); //$NON-NLS-1$
+        return null;
     }
 
     private void dispose()
@@ -444,7 +440,10 @@
                     if (_forceRefresh || isModelDirty())
                     {
                         model = getModelForFile(_file);
-                        refreshInternal(model);
+                        if (model != null)
+                        {
+                            refreshInternal(model);
+                        }
                         _lastModificationStampMonitor.setModificationStamp(_file.getModificationStamp());
                     }
                 }