[jboss-cvs] JBossAS SVN: r112672 - in projects/jboss-jca/branches/Branch_1_0: common/src/main/java/org/jboss/jca/common/metadata/ra/common and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 21 12:59:23 EST 2012
Author: jesper.pedersen
Date: 2012-02-21 12:59:20 -0500 (Tue, 21 Feb 2012)
New Revision: 112672
Modified:
projects/jboss-jca/branches/Branch_1_0/as/src/main/java/org/jboss/jca/as/upgrader/Main.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapterImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ccm/CachedConnectionManagerImpl.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolStatisticsImpl.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolStatisticsImpl.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/naming/Util.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryImpl.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionImpl.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionManagerImpl.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionSynchronizationRegistryImpl.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/UserTransactionImpl.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/XAResourceWrapperImpl.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
projects/jboss-jca/branches/Branch_1_0/tools/findbugs/filter.xml
projects/jboss-jca/branches/Branch_1_0/web/src/main/java/org/jboss/jca/web/JNDIViewer.java
Log:
Findbugs report cleanups
Modified: projects/jboss-jca/branches/Branch_1_0/as/src/main/java/org/jboss/jca/as/upgrader/Main.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/as/src/main/java/org/jboss/jca/as/upgrader/Main.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/as/src/main/java/org/jboss/jca/as/upgrader/Main.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -46,7 +46,7 @@
/**
* API artifacts
*/
- public static final String[] API_ARTIFACTS = {
+ static final String[] API_ARTIFACTS = {
"ironjacamar-common-api",
"ironjacamar-common-spi",
"ironjacamar-core-api"
@@ -55,7 +55,7 @@
/**
* Implementation artifacts
*/
- public static final String[] IMPLEMENTATION_ARTIFACTS = {
+ static final String[] IMPLEMENTATION_ARTIFACTS = {
"ironjacamar-common-impl",
"ironjacamar-core-impl",
"ironjacamar-deployers-common",
@@ -65,7 +65,7 @@
/**
* JDBC artifacts
*/
- public static final String[] JDBC_ARTIFACTS = {
+ static final String[] JDBC_ARTIFACTS = {
"ironjacamar-jdbc"
};
@@ -155,7 +155,8 @@
delete(toDirectory);
- toDirectory.mkdirs();
+ if (!toDirectory.mkdirs())
+ throw new IOException("Could not create: " + toDirectory);
for (String artifact : API_ARTIFACTS)
{
@@ -396,7 +397,8 @@
File jdbcRoot = new File(ijRoot, "jdbcadapters");
File apiMain = new File(apiRoot, "main");
- apiMain.mkdirs();
+ if (!apiMain.mkdirs())
+ throw new IOException("Could not create: " + apiMain);
for (String artifact : API_ARTIFACTS)
{
@@ -416,7 +418,8 @@
fw.close();
File implMain = new File(implRoot, "main");
- implMain.mkdirs();
+ if (!implMain.mkdirs())
+ throw new IOException("Could not create: " + implMain);
for (String artifact : IMPLEMENTATION_ARTIFACTS)
{
@@ -436,7 +439,8 @@
fw.close();
File jdbcMain = new File(jdbcRoot, "main");
- jdbcMain.mkdirs();
+ if (!jdbcMain.mkdirs())
+ throw new IOException("Could not create: " + jdbcMain);
for (String artifact : JDBC_ARTIFACTS)
{
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapterImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapterImpl.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapterImpl.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -177,6 +177,7 @@
result = prime * result + ((connectionDefinition == null) ? 0 : connectionDefinition.hashCode());
result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((transactionSupport == null) ? 0 : transactionSupport.hashCode());
+ result = prime * result + ((reauthenticationSupport == null) ? 0 : reauthenticationSupport.hashCode());
return result;
}
@@ -234,8 +235,15 @@
{
return false;
}
- if (reauthenticationSupport != other.reauthenticationSupport)
+ if (reauthenticationSupport == null)
{
+ if (other.reauthenticationSupport != null)
+ {
+ return false;
+ }
+ }
+ else if (!reauthenticationSupport.equals(other.reauthenticationSupport))
+ {
return false;
}
if (transactionSupport != other.transactionSupport)
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -108,8 +108,8 @@
return false;
if (!(obj instanceof Connector10Impl))
return false;
- Connector10Impl other = (Connector10Impl) obj;
- return true;
+
+ return super.equals((Connector10Impl) obj);
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ccm/CachedConnectionManagerImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ccm/CachedConnectionManagerImpl.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ccm/CachedConnectionManagerImpl.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -238,13 +238,6 @@
if (trace)
log.tracef("popped object: %s", oldKey);
- /*
- if (!stack.contains(oldKey))
- {
- disconnect(oldKey, unsharableResources);
- }
- */
-
if (debug)
{
if (closeAll(oldKey.getCMToConnectionsMap()) && error)
@@ -372,83 +365,10 @@
}
KeyConnectionAssociation key = new KeyConnectionAssociation(rawKey);
- /*
- if (!stack.contains(key))
- {
- reconnect(key, unsharableResources);
- }
- */
-
stack.addLast(key);
}
/**
- * The <code>reconnect</code> method gets the cmToConnectionsMap
- * from objectToConnectionManagerMap, copies it to the key, and
- * reconnects all the connections in it.
- *
- * @param key a <code>KeyConnectionAssociation</code> value
- * @param unsharableResources a <code>Set</code> value
- * @exception ResourceException if an error occurs
- */
- @SuppressWarnings("unchecked")
- private void reconnect(KeyConnectionAssociation key, Set unsharableResources) throws ResourceException
- {
- ConcurrentMap<ConnectionCacheListener, CopyOnWriteArrayList<ConnectionRecord>> cmToConnectionsMap =
- objectToConnectionManagerMap.get(key);
-
- if (cmToConnectionsMap == null)
- return;
-
- key.setCMToConnectionsMap(cmToConnectionsMap);
- Iterator<Entry<ConnectionCacheListener, CopyOnWriteArrayList<ConnectionRecord>>> cmToConnectionsMapIterator =
- cmToConnectionsMap.entrySet().iterator();
-
- while (cmToConnectionsMapIterator.hasNext())
- {
- Entry<ConnectionCacheListener, CopyOnWriteArrayList<ConnectionRecord>> entry =
- cmToConnectionsMapIterator.next();
-
- ConnectionCacheListener cm = entry.getKey();
- CopyOnWriteArrayList<ConnectionRecord> conns = entry.getValue();
-
- cm.reconnect(conns, unsharableResources);
- }
- }
-
- /**
- * Disconnect connections.
- * @param key key
- * @param unsharableResources resource
- * @throws ResourceException exception
- */
- @SuppressWarnings("unchecked")
- private void disconnect(KeyConnectionAssociation key, Set unsharableResources) throws ResourceException
- {
- ConcurrentMap<ConnectionCacheListener, CopyOnWriteArrayList<ConnectionRecord>> cmToConnectionsMap =
- key.getCMToConnectionsMap();
-
- if (!cmToConnectionsMap.isEmpty())
- {
- objectToConnectionManagerMap.put(key, cmToConnectionsMap);
-
- Iterator<Entry<ConnectionCacheListener, CopyOnWriteArrayList<ConnectionRecord>>> cmToConnectionsMapIterator =
- cmToConnectionsMap.entrySet().iterator();
-
- while (cmToConnectionsMapIterator.hasNext())
- {
- Entry<ConnectionCacheListener, CopyOnWriteArrayList<ConnectionRecord>> entry =
- cmToConnectionsMapIterator.next();
-
- ConnectionCacheListener cm = entry.getKey();
- CopyOnWriteArrayList<ConnectionRecord> conns = entry.getValue();
-
- cm.disconnect(conns, unsharableResources);
- }
- }
- }
-
- /**
* Describe <code>unregisterConnectionCacheListener</code> method here.
* This is a shutdown method called by a connection manager. It will remove all reference
* to that connection manager from the cache, so cached connections from that manager
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -366,10 +366,7 @@
}
// Transaction old connections
- if (cl == null)
- {
- cl = getTransactionOldConnection(trackByTransaction, mcp);
- }
+ cl = getTransactionOldConnection(trackByTransaction, mcp);
// Creates a new connection with given transaction
if (cl == null)
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolStatisticsImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolStatisticsImpl.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolStatisticsImpl.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -25,6 +25,9 @@
import org.jboss.jca.core.api.connectionmanager.pool.PoolStatistics;
import org.jboss.jca.core.connectionmanager.pool.mcp.ManagedConnectionPool;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -32,6 +35,7 @@
import java.util.Map;
import java.util.ResourceBundle;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -43,7 +47,7 @@
public class PoolStatisticsImpl implements PoolStatistics
{
/** Serial version uid */
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
private static final String ACTIVE_COUNT = "ActiveCount";
private static final String AVAILABLE_COUNT = "AvailableCount";
@@ -60,11 +64,11 @@
private static final String TOTAL_CREATION_TIME = "TotalCreationTime";
private int maxPoolSize;
- private ConcurrentMap<Object, ManagedConnectionPool> mcpPools;
- private Set<String> names;
- private Map<String, Class> types;
- private AtomicBoolean enabled;
- private Map<Locale, ResourceBundle> rbs;
+ private transient ConcurrentMap<Object, ManagedConnectionPool> mcpPools;
+ private transient Set<String> names;
+ private transient Map<String, Class> types;
+ private transient AtomicBoolean enabled;
+ private transient Map<Locale, ResourceBundle> rbs;
/**
* Constructor
@@ -73,6 +77,16 @@
*/
public PoolStatisticsImpl(int maxPoolSize, ConcurrentMap<Object, ManagedConnectionPool> mcpPools)
{
+ init(maxPoolSize, mcpPools);
+ }
+
+ /**
+ * Init
+ * @param maxPoolSize The maximum pool size
+ * @param mcpPools The pool map
+ */
+ private void init(int maxPoolSize, ConcurrentMap<Object, ManagedConnectionPool> mcpPools)
+ {
this.maxPoolSize = maxPoolSize;
this.mcpPools = mcpPools;
@@ -541,6 +555,16 @@
}
}
+ private void writeObject(ObjectOutputStream out) throws IOException
+ {
+ out.writeInt(maxPoolSize);
+ }
+
+ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
+ {
+ init(in.readInt(), new ConcurrentHashMap<Object, ManagedConnectionPool>());
+ }
+
/**
* toString
* @return The value
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -174,7 +174,7 @@
if (poolConfiguration.getIdleTimeoutMinutes() > 0)
{
//Register removal support
- IdleRemover.getInstance().registerPool(this, poolConfiguration.getIdleTimeoutMinutes() * 1000 * 60);
+ IdleRemover.getInstance().registerPool(this, poolConfiguration.getIdleTimeoutMinutes() * 1000L * 60);
}
if (poolConfiguration.isBackgroundValidation() && poolConfiguration.getBackgroundValidationMillis() > 0)
@@ -196,13 +196,10 @@
{
if (trace)
{
- synchronized (cls)
- {
- String method = "getConnection(" + subject + ", " + cri + ")";
- log.trace(ManagedConnectionPoolUtility.fullDetails(System.identityHashCode(this), method,
- mcf, clf, pool, poolConfiguration,
- cls, checkedOut, statistics));
- }
+ String method = "getConnection(" + subject + ", " + cri + ")";
+ log.trace(ManagedConnectionPoolUtility.fullDetails(System.identityHashCode(this), method,
+ mcf, clf, pool, poolConfiguration,
+ cls, checkedOut, statistics));
}
else if (debug)
{
@@ -357,7 +354,7 @@
checkedOut.remove(cl);
statistics.setInUsedCount(checkedOut.size());
-
+
doDestroy(cl);
cl = null;
@@ -375,13 +372,10 @@
{
if (trace)
{
- synchronized (cls)
- {
- String method = "returnConnection(" + Integer.toHexString(System.identityHashCode(cl)) + ", " + kill + ")";
- log.trace(ManagedConnectionPoolUtility.fullDetails(System.identityHashCode(this), method,
- mcf, clf, pool, poolConfiguration,
- cls, checkedOut, statistics));
- }
+ String method = "returnConnection(" + Integer.toHexString(System.identityHashCode(cl)) + ", " + kill + ")";
+ log.trace(ManagedConnectionPoolUtility.fullDetails(System.identityHashCode(this), method,
+ mcf, clf, pool, poolConfiguration,
+ cls, checkedOut, statistics));
}
else if (debug)
{
@@ -542,7 +536,7 @@
public void removeIdleConnections()
{
ArrayList<ConnectionListener> destroy = null;
- long timeout = System.currentTimeMillis() - (poolConfiguration.getIdleTimeoutMinutes() * 1000 * 60);
+ long timeout = System.currentTimeMillis() - (poolConfiguration.getIdleTimeoutMinutes() * 1000L * 60);
boolean cont = true;
while (cont)
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolStatisticsImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolStatisticsImpl.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolStatisticsImpl.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -22,6 +22,9 @@
package org.jboss.jca.core.connectionmanager.pool.mcp;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -40,7 +43,7 @@
public class ManagedConnectionPoolStatisticsImpl implements ManagedConnectionPoolStatistics
{
/** Serial version uid */
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
private static final String ACTIVE_COUNT = "ActiveCount";
private static final String AVAILABLE_COUNT = "AvailableCount";
@@ -58,20 +61,20 @@
private int maxPoolSize;
- private Set<String> names;
- private Map<String, Class> types;
- private Map<Locale, ResourceBundle> rbs;
+ private transient Set<String> names;
+ private transient Map<String, Class> types;
+ private transient Map<Locale, ResourceBundle> rbs;
- private AtomicInteger createdCount;
- private AtomicInteger destroyedCount;
- private AtomicInteger maxUsedCount;
- private AtomicLong maxCreationTime;
- private AtomicInteger maxWaitCount;
- private AtomicLong maxWaitTime;
- private AtomicInteger timedOut;
- private AtomicLong totalBlockingTime;
- private AtomicLong totalCreationTime;
- private AtomicInteger inUseCount;
+ private transient AtomicInteger createdCount;
+ private transient AtomicInteger destroyedCount;
+ private transient AtomicInteger maxUsedCount;
+ private transient AtomicLong maxCreationTime;
+ private transient AtomicInteger maxWaitCount;
+ private transient AtomicLong maxWaitTime;
+ private transient AtomicInteger timedOut;
+ private transient AtomicLong totalBlockingTime;
+ private transient AtomicLong totalCreationTime;
+ private transient AtomicInteger inUseCount;
/**
* Constructor
@@ -79,6 +82,15 @@
*/
public ManagedConnectionPoolStatisticsImpl(int maxPoolSize)
{
+ init(maxPoolSize);
+ }
+
+ /**
+ * Init
+ * @param maxPoolSize The maximum pool size
+ */
+ private void init(int maxPoolSize)
+ {
this.maxPoolSize = maxPoolSize;
Set<String> n = new HashSet<String>();
@@ -469,6 +481,16 @@
// No-op
}
+ private void writeObject(ObjectOutputStream out) throws IOException
+ {
+ out.writeInt(maxPoolSize);
+ }
+
+ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
+ {
+ init(in.readInt());
+ }
+
/**
* toString
* @return The value
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -207,7 +207,7 @@
if (poolConfiguration.getIdleTimeoutMinutes() > 0)
{
//Register removal support
- IdleRemover.getInstance().registerPool(this, poolConfiguration.getIdleTimeoutMinutes() * 1000 * 60);
+ IdleRemover.getInstance().registerPool(this, poolConfiguration.getIdleTimeoutMinutes() * 1000L * 60);
}
if (poolConfiguration.isBackgroundValidation() && poolConfiguration.getBackgroundValidationMillis() > 0)
@@ -579,7 +579,7 @@
public void removeIdleConnections()
{
ArrayList<ConnectionListener> destroy = null;
- long timeout = System.currentTimeMillis() - (poolConfiguration.getIdleTimeoutMinutes() * 1000 * 60);
+ long timeout = System.currentTimeMillis() - (poolConfiguration.getIdleTimeoutMinutes() * 1000L * 60);
while (true)
{
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/naming/Util.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/naming/Util.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/naming/Util.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -45,19 +45,6 @@
* @param ctx the parent JNDI Context under which value will be bound
* @param name the name relative to ctx of the subcontext.
* @return The new or existing JNDI subcontext
- * @throws javax.naming.NamingException on any JNDI failure
- */
- private static Context createSubcontext(Context ctx, String name) throws NamingException
- {
- Name n = ctx.getNameParser("").parse(name);
- return createSubcontext(ctx, n);
- }
-
- /**
- * Create a subcontext including any intermediate contexts.
- * @param ctx the parent JNDI Context under which value will be bound
- * @param name the name relative to ctx of the subcontext.
- * @return The new or existing JNDI subcontext
* @throws NamingException on any JNDI failure
*/
private static Context createSubcontext(Context ctx, Name name) throws NamingException
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryImpl.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryImpl.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -363,8 +363,6 @@
}
}
- mc = null;
-
// The managed connection for recovery is now gone
recoverMC = null;
}
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionImpl.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionImpl.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -40,10 +40,10 @@
*/
public class TransactionImpl implements Transaction, Serializable
{
- private static final long serialVersionUID = 1L;
- private int status;
- private Set<Synchronization> syncs;
- private Set<XAResource> xas;
+ private static final long serialVersionUID = 2L;
+ private transient int status;
+ private transient Set<Synchronization> syncs;
+ private transient Set<XAResource> xas;
/**
* Constructor
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionManagerImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionManagerImpl.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionManagerImpl.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -47,6 +47,8 @@
*/
public TransactionManagerImpl()
{
+ this.registry = null;
+ this.terminator = null;
}
/**
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionSynchronizationRegistryImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionSynchronizationRegistryImpl.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/TransactionSynchronizationRegistryImpl.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -39,10 +39,10 @@
*/
public class TransactionSynchronizationRegistryImpl implements TransactionSynchronizationRegistry, Serializable
{
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
private static final String JNDI_NAME = "java:/TransactionSynchronizationRegistry";
- private TxRegistry registry;
- private ConcurrentMap<Long, TxEnv> txe;
+ private transient TxRegistry registry;
+ private transient ConcurrentMap<Long, TxEnv> txe;
/**
* Constructor
@@ -220,7 +220,7 @@
/**
* Transaction environment
*/
- static class TxEnv implements Serializable
+ static class TxEnv
{
private static final long serialVersionUID = 1L;
private Map<Object, Object> envs;
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/UserTransactionImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/UserTransactionImpl.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/UserTransactionImpl.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -43,10 +43,10 @@
*/
public class UserTransactionImpl implements UserTransactionProvider, UserTransaction, Serializable
{
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
private static final String JNDI_NAME = "java:/UserTransaction";
- private TxRegistry registry;
- private UserTransactionRegistry userTransactionRegistry;
+ private transient TxRegistry registry;
+ private transient UserTransactionRegistry userTransactionRegistry;
/**
* Constructor
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/XAResourceWrapperImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/XAResourceWrapperImpl.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/noopts/XAResourceWrapperImpl.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -204,14 +204,4 @@
{
return jndiName;
}
-
- /**
- * Return wrapper for given xid.
- * @param xid xid
- * @return return wrapper
- */
- private Xid convertXid(Xid xid)
- {
- return xid;
- }
}
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -275,9 +275,7 @@
if (dataSources.getDriver(driverName) != null)
{
String dataSourceClass = dataSources.getDriver(driverName).getDataSourceClass();
-
- if (dataSources != null)
- ((DataSourceImpl) dataSource).forceDataSourceClass(dataSourceClass);
+ ((DataSourceImpl) dataSource).forceDataSourceClass(dataSourceClass);
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -54,7 +54,7 @@
private static String factoryName = "java:/ValidatorFactory";
- private ValidatorFactory factory;
+ private volatile ValidatorFactory factory;
/**
* Constructor
@@ -121,7 +121,7 @@
* Set the validator factory name
* @param name The factory name
*/
- public synchronized static void setValidatorFactoryName(String name)
+ public static void setValidatorFactoryName(String name)
{
factoryName = name;
}
@@ -129,7 +129,7 @@
/**
* Init the validator factory
*/
- private synchronized void initValidatorFactory()
+ private void initValidatorFactory()
{
Context context = null;
try
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -84,10 +84,10 @@
private Kernel kernel;
/** Metadata repository */
- protected MetadataRepository mdr;
+ private MetadataRepository mdr;
/** Driver registry */
- protected DriverRegistry driverRegistry;
+ private DriverRegistry driverRegistry;
/**
* Constructor
Modified: projects/jboss-jca/branches/Branch_1_0/tools/findbugs/filter.xml
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/tools/findbugs/filter.xml 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/tools/findbugs/filter.xml 2012-02-21 17:59:20 UTC (rev 112672)
@@ -22,12 +22,30 @@
<Bug code="Se"/>
</Match>
+ <!-- org.jboss.jca.as filter -->
+ <Match>
+ <Class name="org.jboss.jca.as.upgrader.Main"/>
+ <Bug code="OS,OBL"/>
+ </Match>
+
<!-- org.jboss.jca.common filter -->
<Match>
+ <Class name="org.jboss.jca.common.CommonBundle_$bundle"/>
+ <Bug code="Nm,Se"/>
+ </Match>
+ <Match>
+ <Class name="org.jboss.jca.common.CommonLogger_$logger"/>
+ <Bug code="Nm,Se,RI"/>
+ </Match>
+ <Match>
<Class name="org.jboss.jca.common.api.ThreadPool"/>
<Bug code="Nm"/>
</Match>
<Match>
+ <Class name="org.jboss.jca.common.api.metadata.common.Extension"/>
+ <Bug code="Se"/>
+ </Match>
+ <Match>
<Class name="org.jboss.jca.common.metadata.merge.Merger"/>
<Method name="mergeConnectorAndDs" />
<Bug code="NP"/>
@@ -44,6 +62,14 @@
<!-- org.jboss.jca.core filter -->
<Match>
+ <Class name="org.jboss.jca.core.CoreBundle_$bundle"/>
+ <Bug code="Nm,Se"/>
+ </Match>
+ <Match>
+ <Class name="org.jboss.jca.core.CoreLogger_$logger"/>
+ <Bug code="Nm,Se,RI"/>
+ </Match>
+ <Match>
<Class name="org.jboss.jca.core.api.connectionmanager.ConnectionManager"/>
<Bug code="Nm"/>
</Match>
@@ -60,6 +86,10 @@
<Bug code="Nm"/>
</Match>
<Match>
+ <Class name="org.jboss.jca.core.connectionmanager.listener.ConnectionCacheListener"/>
+ <Bug code="Nm"/>
+ </Match>
+ <Match>
<Class name="org.jboss.jca.core.connectionmanager.listener.AbstractConnectionListener"/>
<Bug code="Eq"/>
</Match>
@@ -68,6 +98,22 @@
<Bug code="Nm"/>
</Match>
<Match>
+ <Class name="org.jboss.jca.core.connectionmanager.pool.mcp.ArrayBlockingQueueManagedConnectionPool"/>
+ <Bug code="DLS,NP"/>
+ </Match>
+ <Match>
+ <Class name="org.jboss.jca.core.connectionmanager.pool.mcp.SemaphoreArrayListManagedConnectionPool"/>
+ <Bug code="DLS,NP"/>
+ </Match>
+ <Match>
+ <Class name="org.jboss.jca.core.connectionmanager.pool.mcp.Semaphore"/>
+ <Bug code="Nm"/>
+ </Match>
+ <Match>
+ <Class name="org.jboss.jca.core.connectionmanager.pool.strategy.PoolBySubject$1"/>
+ <Bug code="SIC"/>
+ </Match>
+ <Match>
<Class name="org.jboss.jca.core.mdr.SimpleMetadataRepository"/>
<Bug code="Dm"/>
</Match>
@@ -83,9 +129,29 @@
<Class name="org.jboss.jca.core.spi.transaction.xa.XATerminator"/>
<Bug code="Nm"/>
</Match>
+ <Match>
+ <Class name="org.jboss.jca.core.tx.noopts.TransactionManagerImpl"/>
+ <Bug code="NP"/>
+ </Match>
+ <Match>
+ <Class name="org.jboss.jca.core.tx.noopts.TransactionSynchronizationRegistryImpl"/>
+ <Bug code="Se"/>
+ </Match>
+ <Match>
+ <Class name="org.jboss.jca.core.workmanager.WorkWrapper"/>
+ <Bug code="NP"/>
+ </Match>
<!-- org.jboss.jca.deployers filter -->
<Match>
+ <Class name="org.jboss.jca.deployers.DeployersBundle_$bundle"/>
+ <Bug code="Nm,Se"/>
+ </Match>
+ <Match>
+ <Class name="org.jboss.jca.deployers.DeployersLogger_$logger"/>
+ <Bug code="Nm,Se,RI"/>
+ </Match>
+ <Match>
<Class name="org.jboss.jca.deployers.common.AbstractResourceAdapterDeployer"/>
<Bug code="IP"/>
</Match>
Modified: projects/jboss-jca/branches/Branch_1_0/web/src/main/java/org/jboss/jca/web/JNDIViewer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/web/src/main/java/org/jboss/jca/web/JNDIViewer.java 2012-02-21 17:52:53 UTC (rev 112671)
+++ projects/jboss-jca/branches/Branch_1_0/web/src/main/java/org/jboss/jca/web/JNDIViewer.java 2012-02-21 17:59:20 UTC (rev 112672)
@@ -159,7 +159,7 @@
}
}
- buffer.append(" (class: " + binding.getClassName() + ")");
+ buffer.append(" (class: " + className + ")");
buffer.append(NEW_LINE);
More information about the jboss-cvs-commits
mailing list