Author: vhalbert(a)redhat.com Date: 2010-11-16 18:45:44 -0500 (Tue, 16 Nov 2010) New Revision: 2726 Modified: branches/7.1.x/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java Log: TEIID-1354 found issue when running in hudson Modified: branches/7.1.x/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java =================================================================== --- branches/7.1.x/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java 2010-11-16 21:28:39 UTC (rev 2725) +++ branches/7.1.x/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java 2010-11-16 23:45:44 UTC (rev 2726) @@ -221,14 +221,12 @@ // Convert results to ResultsHolder actualResults = new ResultsHolder(TagNames.Elements.QUERY_RESULTS); actualResults.setQueryID(expectedResults.getQueryID()); + convertResults(resultSet, batchSize, actualResults); if (expectedResults.getRows().size() > 0) { - convertResults(resultSet, batchSize, actualResults); compareResults(actualResults, expectedResults, eMsg, isOrdered); } else if (actualResults.getRows() != null && actualResults.getRows().size() > 0) { - throw new QueryTestFailedException(eMsg + "Expected results indicated no results, but actual shows " + actualResults.getRows().size() + " rows."); //$NON-NLS-1$ - - + throw new QueryTestFailedException(eMsg + "Expected results indicated no results, but actual shows " + actualResults.getRows().size() + " rows."); //$NON-NLS-1$ } // DEBUG: