[jboss-cvs] JBossAS SVN: r92085 - in trunk/connector/src/main/org/jboss/resource: statistic/pool and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2009-08-06 15:44:10 -0400 (Thu, 06 Aug 2009)
New Revision: 92085

Modified:
   trunk/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java
   trunk/connector/src/main/org/jboss/resource/statistic/pool/JBossManagedConnectionPoolStatistics.java
   trunk/connector/src/main/org/jboss/resource/statistic/pool/JBossSubPoolStatistics.java
   trunk/connector/src/main/org/jboss/resource/statistic/pool/JBossXmlSubPoolStatisticFormatter.java
   trunk/connector/src/main/org/jboss/resource/statistic/pool/ManagedConnectionPoolStatistics.java
Log:
[JBAS-6918] Remove track-by-tx from statistics

Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java	2009-08-06 19:29:29 UTC (rev 92084)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java	2009-08-06 19:44:10 UTC (rev 92085)
@@ -1009,8 +1009,6 @@
          {   
             JBossSubPoolStatistics stat = new JBossSubPoolStatistics();
             SubPoolContext subContext = (SubPoolContext)iter.next();
-            Boolean trackByTxn = (subContext.getTrackByTx() != null) ? Boolean.TRUE : Boolean.FALSE;
-            stat.setTrackByTxn(trackByTxn);
             final InternalManagedConnectionPool internalPool = subContext.getSubPool();
             stat.setAvailableConnections(internalPool.getAvailableConnections());
             stat.setConnectionsDestroyed(internalPool.getConnectionDestroyedCount());

Modified: trunk/connector/src/main/org/jboss/resource/statistic/pool/JBossManagedConnectionPoolStatistics.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/statistic/pool/JBossManagedConnectionPoolStatistics.java	2009-08-06 19:29:29 UTC (rev 92084)
+++ trunk/connector/src/main/org/jboss/resource/statistic/pool/JBossManagedConnectionPoolStatistics.java	2009-08-06 19:44:10 UTC (rev 92085)
@@ -52,8 +52,6 @@
    
    private final List subPools;
 
-   private boolean trackByTxn;
-
    private boolean prefill;
    
    public JBossManagedConnectionPoolStatistics(){
@@ -185,17 +183,6 @@
      
    }
 
-   public boolean getTrackByTxn()
-   {
-      return this.trackByTxn;
-   }
-   
-   public void setTrackByTxn(boolean trackByTxn)
-   {
-      this.trackByTxn = trackByTxn;
-   
-   }
-   
    public boolean getPrefill()
    {
       // TODO Auto-generated method stub
@@ -238,7 +225,6 @@
 	   for(Iterator iter = subPools.iterator(); iter.hasNext();)
 	   {		   
          JBossSubPoolStatistics statGroup = (JBossSubPoolStatistics)iter.next();
-         poolStatBuff.append("\n Track By Transaction:" + statGroup.getTrackByTxn()); 
          poolStatBuff.append("\n Available Connections Count:" + statGroup.getAvailableConnections());
          poolStatBuff.append("\n Max Connections In Use Count:" + statGroup.getMaxConnectionsInUse());
          poolStatBuff.append("\n Connections Destroyed Count:" + statGroup.getConnectionsDestroyed());

Modified: trunk/connector/src/main/org/jboss/resource/statistic/pool/JBossSubPoolStatistics.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/statistic/pool/JBossSubPoolStatistics.java	2009-08-06 19:29:29 UTC (rev 92084)
+++ trunk/connector/src/main/org/jboss/resource/statistic/pool/JBossSubPoolStatistics.java	2009-08-06 19:44:10 UTC (rev 92085)
@@ -35,9 +35,6 @@
    /** The serialVersionUID */
    private static final long serialVersionUID = -5089686321382050654L;
 
-   /** The trackByTxn */
-   private Boolean trackByTxn;
-   
    /** The availableConnections */
    private long availableConnections;
    
@@ -150,32 +147,9 @@
    }
 
 
-   /**
-    * Get the trackByTxn.
-    * 
-    * @return the trackByTxn.
-    */
-   public Boolean getTrackByTxn()
-   {
-      return trackByTxn;
-   }
-
-
-   /**
-    * Set the trackByTxn.
-    * 
-    * @param trackByTxn The trackByTxn to set.
-    */
-   public void setTrackByTxn(Boolean trackByTxn)
-   {
-      this.trackByTxn = trackByTxn;
-   }
-
-
    public String toString()
    {
       final StringBuffer statBuff = new StringBuffer();      
-      statBuff.append("Track By Transaction: " + getTrackByTxn() + "\n");
       statBuff.append("Available Connections Count: " + getAvailableConnections() + "\n");
       statBuff.append("Max Connections In Use Count:" + getMaxConnectionsInUse() + "\n");
       statBuff.append("Connections Destroyed Count:" + getConnectionsDestroyed() + "\n");

Modified: trunk/connector/src/main/org/jboss/resource/statistic/pool/JBossXmlSubPoolStatisticFormatter.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/statistic/pool/JBossXmlSubPoolStatisticFormatter.java	2009-08-06 19:29:29 UTC (rev 92084)
+++ trunk/connector/src/main/org/jboss/resource/statistic/pool/JBossXmlSubPoolStatisticFormatter.java	2009-08-06 19:44:10 UTC (rev 92085)
@@ -73,7 +73,6 @@
    private void createChildNode(Document doc, Element root, JBossSubPoolStatistics stat){
     
       root.appendChild(createTextNode(doc, "max-connections-in-use", String.valueOf(stat.getMaxConnectionsInUse())));
-      root.appendChild(createTextNode(doc, "track-by-txn", String.valueOf(stat.getTrackByTxn())));
       root.appendChild(createTextNode(doc, "connections-in-use", String.valueOf(stat.getConnectionsInUse())));
       root.appendChild(createTextNode(doc, "connections-destroyed", String.valueOf(stat.getConnectionsDestroyed())));
       root.appendChild(createTextNode(doc, "available-connections", String.valueOf(stat.getAvailableConnections())));

Modified: trunk/connector/src/main/org/jboss/resource/statistic/pool/ManagedConnectionPoolStatistics.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/statistic/pool/ManagedConnectionPoolStatistics.java	2009-08-06 19:29:29 UTC (rev 92084)
+++ trunk/connector/src/main/org/jboss/resource/statistic/pool/ManagedConnectionPoolStatistics.java	2009-08-06 19:44:10 UTC (rev 92085)
@@ -86,8 +86,6 @@
    public void setIdleTimeout(long idleTimeout);
    public String getCriteria();
    public void setCriteria(String criteria);
-   public boolean getTrackByTxn();
-   public void setTrackByTxn(boolean trackByTxn);
    public boolean getNoTxnSeperatePool();
    public void setNoTxnSeperatePool(boolean noTxnSeperatePool);
    public void setPrefill(boolean prefill);