svn commit: r1421597 - /oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java

[luca]

Author: luca
Date: Thu Dec 13 22:50:05 2012
New Revision: 1421597

URL: http://svn.apache.org/viewvc?rev=1421597&view=rev
Log:
Small changes to DataSourceCatalog to allow it to be subclassed by classes that 
have no validation layer (OODT-540)

Modified:
    
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java

Modified: 
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java?rev=1421597&r1=1421596&r2=1421597&view=diff
==============================================================================
--- 
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
 (original)
+++ 
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
 Thu Dec 13 22:50:05 2012
@@ -1290,11 +1290,8 @@ public class DataSourceCatalog implement
      * @see org.apache.oodt.cas.filemgr.catalog.Catalog#getValidationLayer()
      */
     public ValidationLayer getValidationLayer() throws CatalogException {
-        if (validationLayer == null) {
-            throw new CatalogException("Validation Layer is null!");
-        } else {
-            return validationLayer;
-        }
+       // note that validationLayer may be null to allow for leniency in 
subclasses
+       return validationLayer;
     }
 
     private synchronized void addMetadataValue(Element element,
@@ -1651,7 +1648,7 @@ public class DataSourceCatalog implement
         return retPage;
     }
 
-    private int getResultListSize(Query query, ProductType type)
+    protected int getResultListSize(Query query, ProductType type)
             throws CatalogException {
         Connection conn = null;
         Statement statement = null;