[ADQL] Add NULL tests over the ADQL schema and catalog names.

src/adql/db/SearchColumnList.java

@@ -46,7 +46,7 @@ import cds.utils.TextualSearchList;
  * </i></p>
  * 
  * @author Gr&eacute;gory Mantelet (CDS;ARI)
- * @version 1.2 (11/2013)
+ * @version 1.3 (02/2015)
  */
 public class SearchColumnList extends TextualSearchList<DBColumn> {
 	private static final long serialVersionUID = 1L;
@@ -284,7 +284,7 @@ public class SearchColumnList extends TextualSearchList<DBColumn> {
 					}
 
 					// test the schema name:
-					if (schema != null){
+					if (schema != null && matchTable.getADQLSchemaName() != null){
 						if (IdentifierField.SCHEMA.isCaseSensitive(caseSensitivity)){
 							if (!matchTable.getADQLSchemaName().equals(schema))
 								continue;

src/adql/db/SearchTableList.java

@@ -36,7 +36,7 @@ import cds.utils.TextualSearchList;
  * </p>
  * 
  * @author Gr&eacute;gory Mantelet (CDS;ARI)
- * @version 1.3 (08/2014)
+ * @version 1.3 (02/2015)
  */
 public class SearchTableList extends TextualSearchList<DBTable> {
 	private static final long serialVersionUID = 1L;
@@ -156,22 +156,24 @@ public class SearchTableList extends TextualSearchList<DBTable> {
 			ArrayList<DBTable> result = new ArrayList<DBTable>();
 
 			for(DBTable match : tmpResult){
-				if (IdentifierField.SCHEMA.isCaseSensitive(caseSensitivity)){
-					if (!match.getADQLSchemaName().equals(schema))
-						continue;
-				}else{
-					if (!match.getADQLSchemaName().equalsIgnoreCase(schema))
-						continue;
-				}
-
-				if (catalog != null){
-					if (IdentifierField.CATALOG.isCaseSensitive(caseSensitivity)){
-						if (!match.getADQLCatalogName().equals(catalog))
+				if (match.getADQLSchemaName() != null){
+					if (IdentifierField.SCHEMA.isCaseSensitive(caseSensitivity)){
+						if (!match.getADQLSchemaName().equals(schema))
 							continue;
 					}else{
-						if (!match.getADQLCatalogName().equalsIgnoreCase(catalog))
+						if (!match.getADQLSchemaName().equalsIgnoreCase(schema))
 							continue;
 					}
+
+					if (catalog != null && match.getADQLCatalogName() != null){
+						if (IdentifierField.CATALOG.isCaseSensitive(caseSensitivity)){
+							if (!match.getADQLCatalogName().equals(catalog))
+								continue;
+						}else{
+							if (!match.getADQLCatalogName().equalsIgnoreCase(catalog))
+								continue;
+						}
+					}
 				}
 
 				result.add(match);