Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 8d94fa9e31c1f3cf24bdcfaabc83d59abe7e9e57 https://github.com/teiid/teiid/commit/8d94fa9e31c1f3cf24bdcfaabc83d59abe7... Author: Ramesh Reddy <rareddy(a)jboss.org&gt; Date: 2014-01-06 (Mon, 06 Jan 2014) Changed paths: M jboss-integration/src/main/java/org/teiid/jboss/TransportService.java M odata/src/main/java/org/teiid/odata/LocalClient.java M odata/src/main/java/org/teiid/odata/ODataPlugin.java M odata/src/main/java/org/teiid/odata/ODataSQLBuilder.java M odata/src/main/java/org/teiid/odata/TeiidProducerProvider.java M odata/src/main/resources/org/teiid/odata/i18n.properties M runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java M runtime/src/main/java/org/teiid/transport/LocalServerConnection.java Log Message: ----------- TEIID-2664: Making TeiidProviderProducer client map, concurrent and bounded map. Also registered the TeiidProviderProducer as VDB Lifecycle listener so that this map can be cleaned up when the vdb undeploys, also made the entries in the map as soft-references such that incase of low memory the connection objects can be reclaimed Conflicts: odata/src/main/java/org/teiid/odata/ODataPlugin.java odata/src/main/resources/org/teiid/odata/i18n.properties runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java Commit: a6e086ed4c14d5398f8f57b898d1a7a5ecd306fd https://github.com/teiid/teiid/commit/a6e086ed4c14d5398f8f57b898d1a7a5ecd... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2014-01-06 (Mon, 06 Jan 2014) Changed paths: M jboss-integration/src/main/java/org/teiid/jboss/TransportService.java M odata/src/main/java/org/teiid/odata/TeiidProducerProvider.java M runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java M runtime/src/main/java/org/teiid/transport/ClientServiceRegistry.java M runtime/src/main/java/org/teiid/transport/ClientServiceRegistryImpl.java M runtime/src/main/java/org/teiid/transport/LocalServerConnection.java Log Message: ----------- TEIID-2664 buliding upon the last changes Conflicts: jboss-integration/src/main/java/org/teiid/jboss/TransportService.java runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java Compare: https://github.com/teiid/teiid/compare/56d83aa82d65...a6e086ed4c14