fix broken build
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/a720c48b Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/a720c48b Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/a720c48b Branch: refs/heads/master Commit: a720c48b0c6dad80bc0bc9d5ccb10cd63c5ac275 Parents: c2ac625 Author: Tom Barber <[email protected]> Authored: Fri Oct 30 11:34:01 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Fri Oct 30 11:34:01 2015 +0000 ---------------------------------------------------------------------- .../org/apache/oodt/pcs/input/PGEXMLFileUtils.java | 13 +++++++------ .../DataSourceWorkflowInstanceRepositoryFactory.java | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/a720c48b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java ---------------------------------------------------------------------- diff --git a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java index 0168d93..5839544 100644 --- a/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java +++ b/pcs/input/src/main/java/org/apache/oodt/pcs/input/PGEXMLFileUtils.java @@ -25,6 +25,7 @@ import org.xml.sax.InputSource; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -59,7 +60,7 @@ public final class PGEXMLFileUtils { // if it's null, return null if (matrixs.getLength()==0) { - return null; + return Collections.emptyMap(); } Map matrixMap = new HashMap(matrixs.getLength()); @@ -123,7 +124,7 @@ public final class PGEXMLFileUtils { // if it's null, return null if (matrixs.getLength()==0) { - return null; + return Collections.emptyList(); } List matrixList = new Vector(matrixs.getLength()); @@ -188,7 +189,7 @@ public final class PGEXMLFileUtils { // if it's null, return null if (scalars.getLength()==0) { - return null; + return Collections.emptyMap(); } Map scalarMap = new HashMap(scalars.getLength()); @@ -216,7 +217,7 @@ public final class PGEXMLFileUtils { // if it's null, return null if (scalars.getLength()==0) { - return null; + return Collections.emptyList(); } List scalarList = new Vector(scalars.getLength()); @@ -245,7 +246,7 @@ public final class PGEXMLFileUtils { // if it's null, return null if (vectors.getLength()==0) { - return null; + return Collections.emptyMap(); } Map vectorMap = new HashMap(vectors.getLength()); @@ -289,7 +290,7 @@ public final class PGEXMLFileUtils { // if it's null, return null if (vectors.getLength()==0) { - return null; + return Collections.emptyList(); } List vectorList = new Vector(vectors.getLength()); http://git-wip-us.apache.org/repos/asf/oodt/blob/a720c48b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java index 3b87a6c..be665c4 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepositoryFactory.java @@ -76,7 +76,7 @@ public class DataSourceWorkflowInstanceRepositoryFactory implements GenericObjectPool connectionPool = new GenericObjectPool(null); - dataSource = new PoolingDataSource(connectionPool);o + dataSource = new PoolingDataSource(connectionPool); quoteFields = Boolean .getBoolean("org.apache.oodt.cas.workflow.instanceRep.datasource.quoteFields"); pageSize = Integer.getInteger(
