commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joe...@apache.org
Subject svn commit: r891526 - in /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed: LocalXAConnectionFactory.java ManagedConnection.java TransactionRegistry.java
Date Thu, 17 Dec 2009 03:20:00 GMT
Author: joehni
Date: Thu Dec 17 03:19:58 2009
New Revision: 891526

URL: http://svn.apache.org/viewvc?rev=891526&view=rev
Log:
Spelling.

Modified:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/LocalXAConnectionFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/ManagedConnection.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/TransactionRegistry.java

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/LocalXAConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/LocalXAConnectionFactory.java?rev=891526&r1=891525&r2=891526&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/LocalXAConnectionFactory.java
(original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/LocalXAConnectionFactory.java
Thu Dec 17 03:19:58 2009
@@ -58,10 +58,10 @@
     }
 
     public Connection createConnection() throws SQLException {
-        // create a new conection
+        // create a new connection
         Connection connection = connectionFactory.createConnection();
 
-        // create a XAResource to manage the connection during XA transacitons
+        // create a XAResource to manage the connection during XA transactions
         XAResource xaResource = new LocalXAResource(connection);
 
         // register the xa resource for the connection
@@ -107,7 +107,7 @@
          *
          * @param xid  the id of the transaction branch for this connection
          * @param flag either XAResource.TMNOFLAGS or XAResource.TMRESUME
-         * @throws XAException if the connection is already elisted in another tranction,
or if auto-commit
+         * @throws XAException if the connection is already enlisted in another transaction,
or if auto-commit
          *                     could not be disabled
          */
         public synchronized void start(Xid xid, int flag) throws XAException {
@@ -149,7 +149,7 @@
          *
          * @param xid  the id of the transaction branch for this connection
          * @param flag ignored
-         * @throws XAException if the connection is already elisted in another tranction
+         * @throws XAException if the connection is already enlisted in another transaction
          */
         public synchronized void end(Xid xid, int flag) throws XAException {
             if (xid == null) throw new NullPointerException("xid is null");
@@ -185,7 +185,7 @@
                 // no big deal
             }
 
-            // this is a local (one phase) only connectiion, so we can't prepare
+            // this is a local (one phase) only connection, so we can't prepare
             return XAResource.XA_OK;
         }
 
@@ -222,7 +222,7 @@
         }
 
         /**
-         * Rollsback the transaction and restores the original auto commit setting.
+         * Rolls back the transaction and restores the original auto commit setting.
          *
          * @param xid the id of the transaction branch for this connection
          * @throws XAException if connection.rollback() throws a SQLException
@@ -268,7 +268,7 @@
         /**
          * Always returns a zero length Xid array.  The LocalXAConnectionFactory can not
support recovery, so no xids will ever be found.
          *
-         * @param flag ignored since recoverty is not supported
+         * @param flag ignored since recovery is not supported
          * @return always a zero length Xid array.
          */
         public Xid[] recover(int flag) {

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/ManagedConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/ManagedConnection.java?rev=891526&r1=891525&r2=891526&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/ManagedConnection.java
(original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/ManagedConnection.java
Thu Dec 17 03:19:58 2009
@@ -25,16 +25,16 @@
 
 /**
  * ManagedConnection is responsible for managing a database connection in a transactional
environment
- * (typically called "Container Managed").  A managed connection opperates like any other
connection
- * when no gloabal transaction (a.k.a. XA transaction or JTA Transaction) is in progress.
 When a
+ * (typically called "Container Managed").  A managed connection operates like any other
connection
+ * when no global transaction (a.k.a. XA transaction or JTA Transaction) is in progress.
 When a
  * global transaction is active a single physical connection to the database is used by all
  * ManagedConnections accessed in the scope of the transaction.  Connection sharing means
that all
  * data access during a transaction has a consistent view of the database.  When the global
transaction
  * is committed or rolled back the enlisted connections are committed or rolled back.  Typically
upon
  * transaction completion, a connection returns to the auto commit setting in effect before
being
- * elisted in the transaction, but some vendors do not propertly implement this.
+ * enlisted in the transaction, but some vendors do not properly implement this.
  *
- * When enslisted in a transaction the setAutoCommit(), commit(), rollback(), and setReadOnly()
methods
+ * When enlisted in a transaction the setAutoCommit(), commit(), rollback(), and setReadOnly()
methods
  * throw a SQLException.  This is necessary to assure that the transaction completes as a
single unit.
  *
  * @author Dain Sundstrom
@@ -76,7 +76,7 @@
             }
         }
 
-        // the existing transction context ended (or we didn't have one), get the active
transaction context
+        // the existing transaction context ended (or we didn't have one), get the active
transaction context
         transactionContext = transactionRegistry.getActiveTransactionContext();
 
         // if there is an active transaction context and it already has a shared connection,
use it
@@ -91,7 +91,7 @@
                 try {
                     pool.returnObject(connection);
                 } catch (Exception ignored) {
-                    // whatever... try to invalidat the connection
+                    // whatever... try to invalidate the connection
                     try {
                         pool.invalidateObject(connection);
                     } catch (Exception ignore) {
@@ -183,12 +183,12 @@
                 // don't actually close the connection if in a transaction
                 if (!delegate.isClosed()) {
                     // don't use super.close() because it calls passivate() which marks the
-                    // the connection as cloased without returning it to the pool
+                    // the connection as closed without returning it to the pool
                     delegate.close();
                 }
             } catch (SQLException ignored) {
                 // not a whole lot we can do here as connection is closed
-                // and this is a transaction classback so there is no
+                // and this is a transaction callback so there is no
                 // way to report the error
             } finally {
                 _closed = true;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/TransactionRegistry.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/TransactionRegistry.java?rev=891526&r1=891525&r2=891526&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/TransactionRegistry.java
(original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/TransactionRegistry.java
Thu Dec 17 03:19:58 2009
@@ -33,7 +33,7 @@
  * TransactionRegistry tracks Connections and XAResources in a transacted environment for
a single XAConnectionFactory.
  * </p>
  * The TransactionRegistry hides the details of transaction processing from the existing
DBCP pooling code, and gives
- * the ManagedConnection a way to enlist connections in a tranaction, allowing for the maximal
resue of DBCP.
+ * the ManagedConnection a way to enlist connections in a transaction, allowing for the maximal
rescue of DBCP.
  *
  * @author Dain Sundstrom
  * @version $Revision$
@@ -52,8 +52,8 @@
     }
 
     /**
-     * Registers the association between a Connection and a XAResource.  When a conection
-     * is enlisted in a transaction, it is acutally the XAResource that is given to the transaction
+     * Registers the association between a Connection and a XAResource.  When a connection
+     * is enlisted in a transaction, it is actually the XAResource that is given to the transaction
      * manager.
      *
      * @param connection the JDBC connection



Mime
View raw message