You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2011/11/28 06:12:25 UTC
svn commit: r1206977 - in /oodt/trunk: CHANGES.txt
xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java
Author: mattmann
Date: Mon Nov 28 05:12:24 2011
New Revision: 1206977
URL: http://svn.apache.org/viewvc?rev=1206977&view=rev
Log:
- fix for OODT-337 XMLPSProductHandler methods should return empty lists instead of null (contributed by Ricky Nguyen)
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java
Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1206977&r1=1206976&r2=1206977&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Mon Nov 28 05:12:24 2011
@@ -4,6 +4,9 @@ Apache OODT Change Log
Release 0.4: Current Development
--------------------------------------------
+* OODT-337 XMLPSProductHandler methods should return empty lists instead
+ of null (Ricky Nguyen via mattmann)
+
* OODT-336 xmlps should omit joining of tables that are unnecessary to
fulfill query (Ricky Nguyen via mattmann)
Modified: oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java
URL: http://svn.apache.org/viewvc/oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java?rev=1206977&r1=1206976&r2=1206977&view=diff
==============================================================================
--- oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java (original)
+++ oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java Mon Nov 28 05:12:24 2011
@@ -41,6 +41,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -150,7 +151,7 @@ public class XMLPSProductHandler impleme
protected List<QueryElement> getElemNamesFromQueryElemSet(
List<QueryElement> origSet) {
if (origSet == null || (origSet != null && origSet.size() == 0))
- return null;
+ return Collections.emptyList();
List<QueryElement> newSet = new Vector<QueryElement>();
@@ -171,7 +172,7 @@ public class XMLPSProductHandler impleme
protected List<QueryElement> getConstElemNamesFromQueryElemSet(
List<QueryElement> origSet) {
if (origSet == null || (origSet != null && origSet.size() == 0))
- return null;
+ return Collections.emptyList();
List<QueryElement> newSet = new Vector<QueryElement>();
@@ -307,7 +308,7 @@ public class XMLPSProductHandler impleme
private List<String> toSQLResultSetColumns(List<QueryElement> elems) {
if (elems == null || (elems != null && elems.size() == 0))
- return null;
+ return Collections.emptyList();
List<String> resultSetNames = new ArrayList<String>();
for (QueryElement qe : elems) {