[jboss-svn-commits] JBL Code SVN: r26521 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 13 20:32:35 EDT 2009
Author: mark.proctor at jboss.com
Date: 2009-05-13 20:32:35 -0400 (Wed, 13 May 2009)
New Revision: 26521
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDebugHandler.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEnabledExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java
Log:
JBRULES-2066 Unusable error message during test scnario execution: Exception executing predicate org.drools.base.mvel.MVELPredicateExpression at 739c6e
-Added toStrings() to the MVEL expressions, which displays the expression text.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java 2009-05-14 00:19:05 UTC (rev 26520)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java 2009-05-14 00:32:35 UTC (rev 26521)
@@ -97,9 +97,6 @@
CompiledExpression compexpr = (CompiledExpression) this.expr;
- //Receive breakpoints from debugger
- MVELDebugHandler.prepare();
-
if ( MVELDebugHandler.isDebugMode() ) {
if ( MVELDebugHandler.verbose ) {
System.out.println( DebugTools.decompile( compexpr ) );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java 2009-05-14 00:19:05 UTC (rev 26520)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java 2009-05-14 00:32:35 UTC (rev 26521)
@@ -123,6 +123,10 @@
this.languageLevel = languageLevel;
this.strictMode = strictMode;
+ }
+
+ public String getExpression() {
+ return expression;
}
public void setShadowIdentifiers(String[] shadowIdentifiers) {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java 2009-05-14 00:19:05 UTC (rev 26520)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java 2009-05-14 00:32:35 UTC (rev 26521)
@@ -67,9 +67,6 @@
CompiledExpression compexpr = (CompiledExpression) this.expr;
- // Receive breakpoints from debugger
- MVELDebugHandler.prepare();
-
pkg = knowledgeHelper.getWorkingMemory().getRuleBase().getPackage(
knowledgeHelper.getRule().getPackage());
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDebugHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDebugHandler.java 2009-05-14 00:19:05 UTC (rev 26520)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDebugHandler.java 2009-05-14 00:32:35 UTC (rev 26521)
@@ -92,13 +92,6 @@
}
/**
- * Do nothing for now. ensures that class is loaded prior debug handler
- */
- public static void prepare() {
- //do nothing
- }
-
- /**
* Returns current debug mode.<br/>
* Holds lazy initialized internal reference to improve performance.<br/>
* Therefore you can't change System property "mvel.debugger" after isDebugMode is called at least once.<br/>
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEnabledExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEnabledExpression.java 2009-05-14 00:19:05 UTC (rev 26520)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEnabledExpression.java 2009-05-14 00:32:35 UTC (rev 26521)
@@ -78,5 +78,9 @@
null,
factory )).booleanValue();
}
+
+ public String toString() {
+ return this.unit.getExpression();
+ }
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java 2009-05-14 00:19:05 UTC (rev 26520)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java 2009-05-14 00:32:35 UTC (rev 26521)
@@ -85,5 +85,9 @@
factory );
return result.booleanValue();
}
+
+ public String toString() {
+ return this.unit.getExpression();
+ }
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java 2009-05-14 00:19:05 UTC (rev 26520)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java 2009-05-14 00:32:35 UTC (rev 26521)
@@ -77,5 +77,9 @@
factory );
return result.booleanValue();
}
+
+ public String toString() {
+ return this.unit.getExpression();
+ }
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java 2009-05-14 00:19:05 UTC (rev 26520)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java 2009-05-14 00:32:35 UTC (rev 26521)
@@ -98,9 +98,6 @@
CompiledExpression compexpr = (CompiledExpression) this.expr;
- //Receive breakpoints from debugger
- MVELDebugHandler.prepare();
-
Object value;
if ( MVELDebugHandler.isDebugMode() ) {
if ( MVELDebugHandler.verbose ) {
@@ -125,5 +122,9 @@
public Serializable getCompExpr() {
return expr;
}
+
+ public String toString() {
+ return this.unit.getExpression();
+ }
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java 2009-05-14 00:19:05 UTC (rev 26520)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java 2009-05-14 00:32:35 UTC (rev 26521)
@@ -86,5 +86,9 @@
public Object createContext() {
return this.prototype.clone();
}
+
+ public String toString() {
+ return this.unit.getExpression();
+ }
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java 2009-05-14 00:19:05 UTC (rev 26520)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java 2009-05-14 00:32:35 UTC (rev 26521)
@@ -71,5 +71,9 @@
return ((Number) MVEL.executeExpression( this.expr,
factory )).intValue();
}
+
+ public String toString() {
+ return this.unit.getExpression();
+ }
}
More information about the jboss-svn-commits
mailing list