[jbosstools-commits] JBoss Tools SVN: r32248 - in branches/jbosstools-3.2.x/smooks: plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core and 1 other directories.

Author: tfennelly Date: 2011-06-21 04:14:15 -0400 (Tue, 21 Jun 2011) New Revision: 32248 Modified: branches/jbosstools-3.2.x/smooks/ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/SmooksSAXXMLHandler.java branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java Log: JBIDE-8917: NPE when validating transform_XML2XML_date_manipulation project example https://issues.jboss.org/browse/JBIDE-8917 Property changes on: branches/jbosstools-3.2.x/smooks ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/smooks:29129-29130,29167-29168 + /trunk/smooks:29129-29130,29167-29168,32217-32218 Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/SmooksSAXXMLHandler.java =================================================================== --- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/SmooksSAXXMLHandler.java 2011-06-21 07:53:56 UTC (rev 32247) +++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/SmooksSAXXMLHandler.java 2011-06-21 08:14:15 UTC (rev 32248) @@ -129,7 +129,7 @@ @Override public void comment(char[] ch, int start, int length) { String comment = new String(ch, start, length); - Object obj = objects.get(objects.size() - 1); + Object obj = getObject(objects.size() - 1); if (mixedTargets.peek() != null) { if (text != null) { @@ -158,6 +158,24 @@ } + /** + * @return + */ + private Object getObject(int index) { + if(index < 0 || index >= objects.size()) { + return null; + } + + // Need to perform the following check on the underlying objects.data[], before calling objects.get(), + // otherwise BasicEList throws a wobbler... + Object[] data = objects.data(); + if(data == null || data[index] == null) { + return null; + } + + return objects.get(index); + } + /* * (non-Javadoc) * Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java =================================================================== --- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2011-06-21 07:53:56 UTC (rev 32247) +++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2011-06-21 08:14:15 UTC (rev 32248) @@ -671,7 +671,7 @@ try { smooksResource.load(Collections.emptyMap()); smooksModel = smooksResource.getContents().get(0); - } catch (IOException e) { + } catch (Exception e) { initSmooksModelException = e; } } else {