From: <bh...@us...> - 2006-10-24 14:35:24
|
Revision: 313 http://svn.sourceforge.net/cishell/?rev=313&view=rev Author: bh2 Date: 2006-10-24 07:35:20 -0700 (Tue, 24 Oct 2006) Log Message: ----------- added another null check Modified Paths: -------------- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java =================================================================== --- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2006-10-24 14:34:55 UTC (rev 312) +++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2006-10-24 14:35:20 UTC (rev 313) @@ -110,14 +110,16 @@ if (outData != null && data != null && originalData != null && originalData.length == data.length) { for (int i=0; i < outData.length; i++) { - Object parent = outData[i].getMetaData().get(DataProperty.PARENT); - - if (parent != null) { - for (int j=0; j < data.length; i++) { - if (parent == data[j]) { - outData[i].getMetaData().put(DataProperty.PARENT, - originalData[j]); - break; + if (outData[i] != null) { + Object parent = outData[i].getMetaData().get(DataProperty.PARENT); + + if (parent != null) { + for (int j=0; j < data.length; i++) { + if (parent == data[j]) { + outData[i].getMetaData().put(DataProperty.PARENT, + originalData[j]); + break; + } } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |