Provide additional method to avoid multiple load

eclipse-birt · Mar 9, 2018 · 02f04b9 · 02f04b9
1 parent 5940b61
commit 02f04b9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...pse.birt.core/src/org/eclipse/birt/core/script/functionservice/impl/FunctionProvider.java b/...pse.birt.core/src/org/eclipse/birt/core/script/functionservice/impl/FunctionProvider.java
@@ -38,7 +38,7 @@ public class FunctionProvider
 	 */
 	public static void setFunctionProvider( IFunctionProvider provider )
 	{
-		if ( FunctionProvider.instance == null )
+		if ( !isLoaded( ) )
 		{
 			FunctionProvider.instance = provider;
 		}
@@ -47,6 +47,11 @@ public static void setFunctionProvider( IFunctionProvider provider )
 			logger.warning( "FunctionProvider should not set twice." ); //$NON-NLS-1$
 		}
 	}
+
+	public static boolean isLoaded( )
+	{
+		return FunctionProvider.instance != null;
+	}
 
 	protected synchronized static IFunctionProvider getFunctionProvider( )
 	{