[jboss-cvs] JBossAS SVN: r108898 - in projects/jboss-jca/trunk: core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 25 12:44:01 EDT 2010
Author: jesper.pedersen
Date: 2010-10-25 12:44:01 -0400 (Mon, 25 Oct 2010)
New Revision: 108898
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/PoolFiller.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
projects/jboss-jca/trunk/tools/findbugs/filter.xml
Log:
QE fixes
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java 2010-10-25 16:37:07 UTC (rev 108897)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java 2010-10-25 16:44:01 UTC (rev 108898)
@@ -686,7 +686,8 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (ResourceAdapter1516.Tag.forName(reader.getLocalName()) == ResourceAdapter1516.Tag.INBOUND_RESOURCEADAPTER)
+ if (ResourceAdapter1516.Tag.forName(reader.getLocalName()) ==
+ ResourceAdapter1516.Tag.INBOUND_RESOURCEADAPTER)
{
//building and returning object
@@ -730,7 +731,8 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (InboundResourceAdapter.Tag.forName(reader.getLocalName()) == InboundResourceAdapter.Tag.MESSAGEADAPTER)
+ if (InboundResourceAdapter.Tag.forName(reader.getLocalName()) ==
+ InboundResourceAdapter.Tag.MESSAGEADAPTER)
{
//trimming collections
messagelistener.trimToSize();
@@ -952,7 +954,8 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (ResourceAdapter1516.Tag.forName(reader.getLocalName()) == ResourceAdapter1516.Tag.OUTBOUND_RESOURCEADAPTER)
+ if (ResourceAdapter1516.Tag.forName(reader.getLocalName()) ==
+ ResourceAdapter1516.Tag.OUTBOUND_RESOURCEADAPTER)
{
//trimming collections
@@ -1019,7 +1022,8 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (OutboundResourceAdapter.Tag.forName(reader.getLocalName()) == OutboundResourceAdapter.Tag.CONNECTION_DEFINITION)
+ if (OutboundResourceAdapter.Tag.forName(reader.getLocalName()) ==
+ OutboundResourceAdapter.Tag.CONNECTION_DEFINITION)
{
//trimming collections
@@ -1092,7 +1096,8 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (OutboundResourceAdapter.Tag.forName(reader.getLocalName()) == OutboundResourceAdapter.Tag.AUTHENTICATION_MECHANISM)
+ if (OutboundResourceAdapter.Tag.forName(reader.getLocalName()) ==
+ OutboundResourceAdapter.Tag.AUTHENTICATION_MECHANISM)
{
//trimming collections
@@ -1299,7 +1304,8 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (ResourceAdapter1516.Tag.forName(reader.getLocalName()) == ResourceAdapter1516.Tag.SECURITY_PERMISSION)
+ if (ResourceAdapter1516.Tag.forName(reader.getLocalName()) ==
+ ResourceAdapter1516.Tag.SECURITY_PERMISSION)
{
//trimming collections
description.trimToSize();
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/PoolFiller.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/PoolFiller.java 2010-10-25 16:37:07 UTC (rev 108897)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/PoolFiller.java 2010-10-25 16:44:01 UTC (rev 108898)
@@ -84,27 +84,20 @@
while (true)
{
- try
- {
- ManagedConnectionPool mcp = null;
+ ManagedConnectionPool mcp = null;
- while (true)
+ while (true)
+ {
+ synchronized (pools)
{
- synchronized (pools)
- {
- mcp = pools.removeFirst();
- }
+ mcp = pools.removeFirst();
+ }
- if (mcp == null)
- break;
+ if (mcp == null)
+ break;
- mcp.fillToMin();
- }
+ mcp.fillToMin();
}
- catch (Exception e)
- {
- // Ignore
- }
try
{
@@ -113,7 +106,6 @@
while (pools.isEmpty())
{
pools.wait();
-
}
}
}
@@ -139,7 +131,7 @@
synchronized (pools)
{
pools.addLast(mcp);
- pools.notify();
+ pools.notifyAll();
}
}
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2010-10-25 16:37:07 UTC (rev 108897)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2010-10-25 16:44:01 UTC (rev 108898)
@@ -39,7 +39,6 @@
import org.jboss.jca.core.connectionmanager.pool.api.PoolFactory;
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
-import org.jboss.jca.deployers.fungal.DsXmlDeployer;
import java.net.URL;
import java.util.ArrayList;
@@ -62,7 +61,7 @@
public abstract class AbstractDsDeployer
{
/** log **/
- protected static Logger log = Logger.getLogger(AbstractDsDeployer.class);
+ protected Logger log;
/** jdbcLocal **/
protected String jdbcLocal;
@@ -77,13 +76,12 @@
protected MetadataRepository mdr;
/**
- *
* Create a new AbstractDsDeployer.
- *
+ * @param log The logger
*/
- public AbstractDsDeployer()
+ public AbstractDsDeployer(Logger log)
{
- super();
+ this.log = log;
}
/**
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java 2010-10-25 16:37:07 UTC (rev 108897)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java 2010-10-25 16:44:01 UTC (rev 108898)
@@ -38,6 +38,8 @@
import java.util.List;
import java.util.Set;
+import org.jboss.logging.Logger;
+
import com.github.fungal.api.Kernel;
import com.github.fungal.api.util.Injection;
import com.github.fungal.spi.deployers.DeployException;
@@ -50,15 +52,16 @@
*/
public final class DsXmlDeployer extends AbstractDsDeployer implements Deployer
{
-
/** The kernel */
- Kernel kernel;
+ private Kernel kernel;
/**
* Constructor
*/
public DsXmlDeployer()
{
+ super(Logger.getLogger(DsXmlDeployer.class));
+
transactionManager = null;
jdbcLocal = null;
jdbcXA = null;
Modified: projects/jboss-jca/trunk/tools/findbugs/filter.xml
===================================================================
--- projects/jboss-jca/trunk/tools/findbugs/filter.xml 2010-10-25 16:37:07 UTC (rev 108897)
+++ projects/jboss-jca/trunk/tools/findbugs/filter.xml 2010-10-25 16:44:01 UTC (rev 108898)
@@ -70,6 +70,14 @@
<!-- org.jboss.jca.deployers filter -->
<Match>
+ <Class name="org.jboss.jca.deployers.common.AbstractResourceAdapterDeployer"/>
+ <Bug code="IP"/>
+ </Match>
+ <Match>
+ <Class name="org.jboss.jca.deployers.fungal.AbstractFungalDeployment"/>
+ <Bug code="EI2"/>
+ </Match>
+ <Match>
<Class name="org.jboss.jca.deployers.fungal.DsXmlDeployer"/>
<Bug code="IS"/>
</Match>
More information about the jboss-cvs-commits
mailing list