[jboss-svn-commits] JBL Code SVN: r25416 - labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2009-02-24 22:26:57 -0500 (Tue, 24 Feb 2009)
New Revision: 25416

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java
Log:
JBRULES-1979: Validate variable types in actions in MVEL
 - added support for user classes

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java	2009-02-25 03:04:27 UTC (rev 25415)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java	2009-02-25 03:26:57 UTC (rev 25416)
@@ -107,8 +107,9 @@
 	                            null,
 	                            "Could not find variable '" + variableName + "' for action '" + actionDescr.getText() + "'" ) );            		
 	            	} else {
-	            		variableClasses.put(variableName, Class.forName(
-            				variableScope.findVariable(variableName).getType().getStringType()));
+	            		variableClasses.put(variableName,
+            				context.getDialect().getTypeResolver().resolveType(
+        						variableScope.findVariable(variableName).getType().getStringType()));
 	            	}
 	            }
             }
@@ -134,7 +135,7 @@
             context.getErrors().add( new DescrBuildError( context.getParentDescr(),
                                                           actionDescr,
                                                           null,
-                                                          "Unable to build expression for 'action' : " + e.getMessage() + " '"+ actionDescr.getText() + "'" ) );
+                                                          "Unable to build expression for action '" + actionDescr.getText() + "' :" + e ) );
         }
     }