[teiid-commits] teiid SVN: r1707 - trunk/test-integration/db/src/main/java/org/teiid/test/framework/query.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2010-01-05 11:53:42 -0500 (Tue, 05 Jan 2010)
New Revision: 1707

Modified:
   trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java
Log:
Teiid 781 - fix NPE occuring when expection wasnt found

Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java	2010-01-05 15:50:15 UTC (rev 1706)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java	2010-01-05 16:53:42 UTC (rev 1707)
@@ -297,8 +297,11 @@
 	if (super.getLastException() != null) {
 	    return super.getLastException();
 	}
+	if (this.applicationException != null) {
+	    return new SQLException(this.applicationException.getClass().getName() + ":" + this.applicationException.getMessage());
+	}
 	
-	return new SQLException(this.applicationException.getClass().getName() + ":" + this.applicationException.getMessage());
+	return null;
      }
 
     @Override