Null check.

eclipse-birt · Oct 25, 2012 · d34c418 · d34c418
1 parent 32f5b13
commit d34c418
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...r.script/src/org/eclipse/birt/report/designer/ui/editor/script/DecoratedScriptEditor.java b/...r.script/src/org/eclipse/birt/report/designer/ui/editor/script/DecoratedScriptEditor.java
@@ -265,11 +265,12 @@ public void run( )
 	public void setAction( String actionID, IAction action )
 	{
 		super.setAction( actionID, action );
-		if ( action.getId( ) == null )
+		if ( action != null && action.getId( ) == null )
 		{
 			action.setId( actionID );
 		}
-		getActionRegistry( ).registerAction( action );
+		if ( action != null )
+			getActionRegistry( ).registerAction( action );
 	}
 
 	/*