--- a/buildframework/helium/sf/java/quality/src/com/nokia/helium/quality/ant/taskdefs/Coverity.java	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/sf/java/quality/src/com/nokia/helium/quality/ant/taskdefs/Coverity.java	Thu Jul 22 17:08:43 2010 +0300
@@ -18,8 +18,6 @@
 
 import java.io.File;
 import java.util.Vector;
-import java.util.Map.Entry;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.ExecTask;
@@ -85,10 +83,16 @@
         task.setDir(new File(this.dir));
         
         for (VariableSet coverityArg : coverityOptions) {
-            for (Entry<String, Variable> entry : coverityArg.getVariablesMap().entrySet() ) {
-                task.createArg().setValue(entry.getKey());
-                task.createArg().setValue(entry.getValue().getValue());
-                commandString = commandString + " " + entry.getKey() + " " + entry.getValue().getValue();
+            for (Variable var : coverityArg.getVariables()) {
+                if (var.getValue().startsWith(var.getName())) {
+                    task.createArg().setLine(var.getValue());
+                    commandString = commandString + " " + var.getValue() ;
+                } else {
+                    task.createArg().setValue(var.getName());
+                    task.createArg().setValue(var.getValue());
+                    commandString = commandString + " " + var.getName() + " "
+                            + var.getValue();
+                }
             }
         }