summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlzhang2012-01-11 01:21:21 (EST)
committer mwu2012-01-11 01:21:21 (EST)
commit4112beed9b76cf72158aa923840d0638eebba675 (patch)
tree5cc10f6d71eaaa132f4af125e5f22a05ab637c05
parent8f27563f7a5246bed07d7f0e2f8992786916c66c (diff)
downloadorg.eclipse.birt-4112beed9b76cf72158aa923840d0638eebba675.zip
org.eclipse.birt-4112beed9b76cf72158aa923840d0638eebba675.tar.gz
org.eclipse.birt-4112beed9b76cf72158aa923840d0638eebba675.tar.bz2
Checkin: DA fails while use parameter as reference date in time
function[46557]
-rw-r--r--data/org.eclipse.birt.report.data.adapter/src/org/eclipse/birt/report/data/adapter/api/timeFunction/TimeFunctionManager.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/data/org.eclipse.birt.report.data.adapter/src/org/eclipse/birt/report/data/adapter/api/timeFunction/TimeFunctionManager.java b/data/org.eclipse.birt.report.data.adapter/src/org/eclipse/birt/report/data/adapter/api/timeFunction/TimeFunctionManager.java
index 4456291..8e7f5fa 100644
--- a/data/org.eclipse.birt.report.data.adapter/src/org/eclipse/birt/report/data/adapter/api/timeFunction/TimeFunctionManager.java
+++ b/data/org.eclipse.birt.report.data.adapter/src/org/eclipse/birt/report/data/adapter/api/timeFunction/TimeFunctionManager.java
@@ -532,6 +532,8 @@ public class TimeFunctionManager
IBinding functionBinding = session.getModelAdaptor( )
.adaptBinding( column );
session.shutdown( );
+ if( functionBinding == null )
+ return getCalculationType( column.getCalculationType( ), locale ).getDisplayName( );
ITimePeriod basePeriod = functionBinding.getTimeFunction( )
.getBaseTimePeriod( );
ITimePeriod relativePeriod = functionBinding.getTimeFunction( )