NPE returned during javascript evaluation for interactivity

actions. Fixed by replacing null value with string null.
eclipse-birt · Jul 22, 2014 · c1fd797 · c1fd797
1 parent 93c5b97
commit c1fd797
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/...lipse.birt.chart.reportitem/src/org/eclipse/birt/chart/reportitem/BIRTActionRenderer.java b/...lipse.birt.chart.reportitem/src/org/eclipse/birt/chart/reportitem/BIRTActionRenderer.java
@@ -510,6 +510,10 @@ protected String evaluateExpression( String script )
 			{
 				evaluateResult = "\"" + evaluateResult + "\""; //$NON-NLS-1$//$NON-NLS-2$
 			}
+			else if ( evaluateResult == null )
+			{
+				evaluateResult = "null"; //$NON-NLS-1$
+			}
 
 			script = Pattern.compile( expression, Pattern.LITERAL )
 					.matcher( script )
@@ -528,6 +532,10 @@ protected String evaluateExpression( String script )
 			{
 				evaluateResult = "\"" + evaluateResult + "\""; //$NON-NLS-1$//$NON-NLS-2$
 			}
+			else if ( evaluateResult == null )
+			{
+				evaluateResult = "null"; //$NON-NLS-1$
+			}
 
 			script = Pattern.compile( expression, Pattern.LITERAL )
 					.matcher( script )