[teiid-commits] teiid SVN: r3979 - branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-04-09 08:49:10 -0400 (Mon, 09 Apr 2012)
New Revision: 3979

Modified:
   branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
Log:
TEIID-1994 adding a null check

Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java	2012-04-05 18:56:28 UTC (rev 3978)
+++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java	2012-04-09 12:49:10 UTC (rev 3979)
@@ -709,8 +709,10 @@
         			analysisRecord.setQueryPlan(processor.getProcessorPlan().getDescriptionProperties());
         		}
         		response.setPlanDescription(analysisRecord.getQueryPlan());
-	            response.setAnnotations(analysisRecord.getAnnotations());
-	            analysisRecord.getAnnotations().clear();
+        		if (analysisRecord.getAnnotations() != null && !analysisRecord.getAnnotations().isEmpty()) {
+		            response.setAnnotations(analysisRecord.getAnnotations());
+		            analysisRecord.getAnnotations().clear();
+        		}
         	}
             if (requestMsg.getShowPlan() == ShowPlan.DEBUG) {
             	response.setDebugLog(analysisRecord.getDebugLog());