[teiid-commits] teiid SVN: r1274 - in trunk/runtime/src/main/java/com/metamatrix/dqp/embedded: services and 1 other directory.

Author: rareddy Date: 2009-08-24 17:09:24 -0400 (Mon, 24 Aug 2009) New Revision: 1274 Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java Log: TEIID-779: Fixes for the bugs found during the move of the embedded admin api tests Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java =================================================================== --- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java 2009-08-24 21:06:57 UTC (rev 1273) +++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java 2009-08-24 21:09:24 UTC (rev 1274) @@ -258,6 +258,9 @@ return convertExtensionModule(extModule); } else { + if (src == null) { + return null; + } throw new UnsupportedOperationException(DQPEmbeddedPlugin.Util.getString("UnSupported_object_conversion")); //$NON-NLS-1$ } } Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java =================================================================== --- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-08-24 21:06:57 UTC (rev 1273) +++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-08-24 21:09:24 UTC (rev 1274) @@ -438,7 +438,6 @@ // holds true when DQP restarted. Also, this will be only the case // when shared binding is used. def.addConnectorBinding(existing); - saveVDB(vdb, vdb.getVersion()); } } } @@ -797,7 +796,11 @@ ArrayList<URL> urlPaths = new ArrayList<URL>(); StringTokenizer st = new StringTokenizer(path, ";"); //$NON-NLS-1$ while(st.hasMoreElements()) { - urlPaths.add(getFullyQualifiedPath(st.nextToken())); + String extPath = st.nextToken(); + if (!extPath.endsWith("/")) { //$NON-NLS-1$ + extPath = extPath + "/"; //$NON-NLS-1$ + } + urlPaths.add(getFullyQualifiedPath(extPath)); } return urlPaths.toArray(new URL[urlPaths.size()]); } Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java =================================================================== --- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java 2009-08-24 21:06:57 UTC (rev 1273) +++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java 2009-08-24 21:09:24 UTC (rev 1274) @@ -46,7 +46,6 @@ import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.dqp.service.VDBLifeCycleListener; import com.metamatrix.dqp.service.VDBService; -import com.metamatrix.jdbc.JDBCPlugin; import com.metamatrix.metadata.runtime.api.VirtualDatabaseDoesNotExistException; import com.metamatrix.metadata.runtime.api.VirtualDatabaseException; import com.metamatrix.vdb.runtime.BasicModelInfo; @@ -327,7 +326,7 @@ // if not already done so. int status = getVDB(vdbName, vdbVersion).getStatus(); if (status != VDBStatus.ACTIVE) { - throw new VirtualDatabaseException(JDBCPlugin.Util.getString("VDBService.VDB_does_not_exist._2", vdbName, vdbVersion)); //$NON-NLS-1$ + throw new VirtualDatabaseException(DQPEmbeddedPlugin.Util.getString("VDBService.VDB_does_not_exist._2", vdbName, vdbVersion)); //$NON-NLS-1$ } return vdbVersion; }