[teiid-commits] teiid SVN: r1748 - in branches/JCA: jboss-integration/src/main/java/org/teiid/jboss/deployers and 1 other directory.

Author: rareddy Date: 2010-01-15 13:29:16 -0500 (Fri, 15 Jan 2010) New Revision: 1748 Modified: branches/JCA/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java branches/JCA/jboss-integration/src/main/java/org/teiid/jboss/deployers/ConnectorBindingDeployer.java Log: TEIID-859: controlling the connector threads to be equal to connection pool size Modified: branches/JCA/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java =================================================================== --- branches/JCA/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java 2010-01-15 17:06:09 UTC (rev 1747) +++ branches/JCA/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java 2010-01-15 18:29:16 UTC (rev 1748) @@ -95,14 +95,20 @@ private ConcurrentHashMap<AtomicRequestID, ConnectorWorkItem> requestStates = new ConcurrentHashMap<AtomicRequestID, ConnectorWorkItem>(); private SourceCapabilities cachedCapabilities; - + public ConnectorManager(String name) { + this(name, DEFAULT_MAX_THREADS); + } + + public ConnectorManager(String name, int maxThreads) { if (name == null) { throw new IllegalArgumentException("Connector name can not be null"); } + if (maxThreads <= 0) { + maxThreads = DEFAULT_MAX_THREADS; + } this.connectorName = name; - // TODO: DEFAULT_MAX_THREADS must be configurable rareddy - this.workManager = new StatsCapturingWorkManager(this.connectorName, DEFAULT_MAX_THREADS); + this.workManager = new StatsCapturingWorkManager(this.connectorName, maxThreads); } public String getName() { Modified: branches/JCA/jboss-integration/src/main/java/org/teiid/jboss/deployers/ConnectorBindingDeployer.java =================================================================== --- branches/JCA/jboss-integration/src/main/java/org/teiid/jboss/deployers/ConnectorBindingDeployer.java 2010-01-15 17:06:09 UTC (rev 1747) +++ branches/JCA/jboss-integration/src/main/java/org/teiid/jboss/deployers/ConnectorBindingDeployer.java 2010-01-15 18:29:16 UTC (rev 1748) @@ -62,7 +62,7 @@ ConnectorManager cm = null; try { - cm = createConnectorManger("java:"+connectorName); + cm = createConnectorManger("java:"+connectorName, data.getMaxSize()); cm.start(); cmGroup.addConnectorManager(cm); } catch (ConnectorException e) { @@ -82,8 +82,8 @@ } - ConnectorManager createConnectorManger(String deployedConnectorName) { - ConnectorManager mgr = new ConnectorManager(deployedConnectorName); + ConnectorManager createConnectorManger(String deployedConnectorName, int maxThreads) { + ConnectorManager mgr = new ConnectorManager(deployedConnectorName, maxThreads); return mgr; }