[teiid-commits] teiid SVN: r4478 - in trunk/runtime/src: test/java/org/teiid/runtime and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-09-27 06:05:05 -0400 (Thu, 27 Sep 2012)
New Revision: 4478

Modified:
   trunk/runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java
   trunk/runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java
Log:
TEIID-2230 accounting for empty vdbs

Modified: trunk/runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java	2012-09-27 10:04:26 UTC (rev 4477)
+++ trunk/runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java	2012-09-27 10:05:05 UTC (rev 4478)
@@ -44,8 +44,8 @@
 import org.teiid.metadata.MetadataRepository;
 import org.teiid.metadata.MetadataStore;
 import org.teiid.query.metadata.DDLMetadataRepository;
+import org.teiid.query.metadata.DirectQueryMetadataRepository;
 import org.teiid.query.metadata.NativeMetadataRepository;
-import org.teiid.query.metadata.DirectQueryMetadataRepository;
 import org.teiid.translator.TranslatorException;
 
 public abstract class AbstractVDBDeployer {
@@ -139,6 +139,10 @@
 				loadCount.incrementAndGet();
 			}
 		}
+		if (loadCount.get() == 0) {
+			getVDBRepository().finishDeployment(vdb.getName(), vdb.getVersion());
+			return;
+		}
 		for (ModelMetaData model: vdb.getModelMetaDatas().values()) {
 			MetadataRepository metadataRepository = model.getAttachment(MetadataRepository.class);
 			if (model.getModelType() == Model.Type.PHYSICAL || model.getModelType() == Model.Type.VIRTUAL) {

Modified: trunk/runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java
===================================================================
--- trunk/runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java	2012-09-27 10:04:26 UTC (rev 4477)
+++ trunk/runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java	2012-09-27 10:05:05 UTC (rev 4478)
@@ -275,6 +275,11 @@
 		
 		s.execute("update \"my-view\" set \"my-column\" = 'a'");
 		assertEquals(2, s.getUpdateCount());
+		
+		es.deployVDB("empty");
+		c = es.getDriver().connect("jdbc:teiid:empty", null);
+		s = c.createStatement();
+		s.execute("select * from tables");
 	}
 	
 	@Test(expected=VirtualDatabaseException.class) public void testDeploymentError() throws Exception {