Bugfix: NPE in VotType & MySQL metadata issue in JDBCConnection

src/tap/db/JDBCConnection.java

@@ -3271,7 +3271,8 @@ public class JDBCConnection implements DBConnection {
 			int cnt = 0;
 			String columnPattern = columnCaseSensitive ? columnName : null;
 			while(rsT.next()){
-				String rsSchema = nullifyIfNeeded(rsT.getString(2));
+                                int rsTSchemaIndex = dbms.equalsIgnoreCase(DBMS_MYSQL) ? 1 : 2;
+				String rsSchema = nullifyIfNeeded(rsT.getString(rsTSchemaIndex));
 				String rsTable = rsT.getString(3);
 				// test the schema name:
 				if (!supportsSchema || schemaName == null || equals(rsSchema, schemaName, schemaCaseSensitive)){

src/tap/metadata/VotType.java

@@ -160,13 +160,13 @@ public final class VotType {
 
 			case CHAR:
 				this.datatype = VotDatatype.CHAR;
-				this.arraysize = Integer.toString(tapType.length > 0 ? tapType.length : null);
+				this.arraysize = tapType.length > 0 ? Integer.toString(tapType.length) : null;
 				this.xtype = null;
 				break;
 
 			case BINARY:
 				this.datatype = VotDatatype.UNSIGNEDBYTE;
-				this.arraysize = Integer.toString(tapType.length > 0 ? tapType.length : null);
+				this.arraysize = tapType.length > 0 ? Integer.toString(tapType.length) : null;
 				this.xtype = null;
 				break;