midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BF [ 2819617 ] NPE if script validator rule returns null 

https://sourceforge.net/tracker/?func=detail&aid=2819617&group_id=176962&atid=879332
This commit is contained in:
teo_sarca 2009-07-10 13:58:31 +00:00
parent 4c1cc9bff6
commit b7dfb18e2b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
base/src/org/compiere/model/ModelValidationEngine.java
View File

@ -46,6 +46,8 @@ import org.compiere.util.KeyNamePair;
* https://sourceforge.net/tracker/?func=detail&aid=2788276&group_id=176962&atid=879335 * https://sourceforge.net/tracker/?func=detail&aid=2788276&group_id=176962&atid=879335
* <li>BF [ 2804135 ] Global FactsValidator are not invoked * <li>BF [ 2804135 ] Global FactsValidator are not invoked
* https://sourceforge.net/tracker/?func=detail&aid=2804135&group_id=176962&atid=879332 * https://sourceforge.net/tracker/?func=detail&aid=2804135&group_id=176962&atid=879332
* <li>BF [ 2819617 ] NPE if script validator rule returns null
* https://sourceforge.net/tracker/?func=detail&aid=2819617&group_id=176962&atid=879332
*/ */
public class ModelValidationEngine public class ModelValidationEngine
{ {
@ -228,7 +230,8 @@ public class ModelValidationEngine
engine.put(MRule.ARGUMENTS_PREFIX + "AD_Role_ID", AD_Role_ID); engine.put(MRule.ARGUMENTS_PREFIX + "AD_Role_ID", AD_Role_ID);
engine.put(MRule.ARGUMENTS_PREFIX + "AD_User_ID", AD_User_ID); engine.put(MRule.ARGUMENTS_PREFIX + "AD_User_ID", AD_User_ID);
error = engine.eval(loginRule.getScript()).toString(); Object retval = engine.eval(loginRule.getScript());
error = (retval == null ? "" : retval.toString());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
error = e.toString(); error = e.toString();
@ -355,7 +358,8 @@ public class ModelValidationEngine
engine.put(MRule.ARGUMENTS_PREFIX + "Type", changeType); engine.put(MRule.ARGUMENTS_PREFIX + "Type", changeType);
engine.put(MRule.ARGUMENTS_PREFIX + "Event", ModelValidator.tableEventValidators[changeType]); engine.put(MRule.ARGUMENTS_PREFIX + "Event", ModelValidator.tableEventValidators[changeType]);
error = engine.eval(rule.getScript()).toString(); Object retval = engine.eval(rule.getScript());
error = (retval == null ? "" : retval.toString());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
error = e.toString(); error = e.toString();
@ -500,7 +504,8 @@ public class ModelValidationEngine
engine.put(MRule.ARGUMENTS_PREFIX + "Type", docTiming); engine.put(MRule.ARGUMENTS_PREFIX + "Type", docTiming);
engine.put(MRule.ARGUMENTS_PREFIX + "Event", ModelValidator.documentEventValidators[docTiming]); engine.put(MRule.ARGUMENTS_PREFIX + "Event", ModelValidator.documentEventValidators[docTiming]);
error = engine.eval(rule.getScript()).toString(); Object retval = engine.eval(rule.getScript());
error = (retval == null ? "" : retval.toString());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
error = e.toString(); error = e.toString();