commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pste...@apache.org
Subject svn commit: r883002 - in /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp: PoolableCallableStatement.java PoolingConnection.java
Date Sat, 21 Nov 2009 21:42:48 GMT
Author: psteitz
Date: Sat Nov 21 21:42:48 2009
New Revision: 883002

URL: http://svn.apache.org/viewvc?rev=883002&view=rev
Log:
Eliminated tabs.

Modified:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java?rev=883002&r1=883001&r2=883002&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
Sat Nov 21 21:42:48 2009
@@ -38,41 +38,41 @@
  */
 public class PoolableCallableStatement extends DelegatingCallableStatement implements CallableStatement
{
 
-	/**
-	 * The {@link KeyedObjectPool} from which this CallableStatement was obtained.
-	 */
-	protected KeyedObjectPool _pool = null;
-
-	/**
-	 * Key for this statement in the containing {@link KeyedObjectPool}.
-	 */
-	protected Object _key = null;
-
-	public PoolableCallableStatement(DelegatingConnection c, CallableStatement s) {
-		super(c, s);
-	}
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param stmt the underlying {@link CallableStatement}
-	 * @param key the key for this statement in the {@link KeyedObjectPool}
-	 * @param pool the {@link KeyedObjectPool} from which this CallableStatement was obtained
-	 * @param conn the {@link Connection} that created this CallableStatement
-	 */
-	public PoolableCallableStatement(CallableStatement stmt, Object key, KeyedObjectPool pool,
Connection conn) {
-		super((DelegatingConnection)conn, stmt);
-		_pool = pool;
-		_key = key;
-
-		// Remove from trace now because this statement will be 
-		// added by the activate method.
-		if(_conn != null) {
-			_conn.removeTrace(this);
-		}
-	}
+    /**
+     * The {@link KeyedObjectPool} from which this CallableStatement was obtained.
+     */
+    protected KeyedObjectPool _pool = null;
+
+    /**
+     * Key for this statement in the containing {@link KeyedObjectPool}.
+     */
+    protected Object _key = null;
+
+    public PoolableCallableStatement(DelegatingConnection c, CallableStatement s) {
+        super(c, s);
+    }
+
+    /**
+     * Constructor.
+     * 
+     * @param stmt the underlying {@link CallableStatement}
+     * @param key the key for this statement in the {@link KeyedObjectPool}
+     * @param pool the {@link KeyedObjectPool} from which this CallableStatement was obtained
+     * @param conn the {@link Connection} that created this CallableStatement
+     */
+    public PoolableCallableStatement(CallableStatement stmt, Object key, KeyedObjectPool
pool, Connection conn) {
+        super((DelegatingConnection)conn, stmt);
+        _pool = pool;
+        _key = key;
+
+        // Remove from trace now because this statement will be 
+        // added by the activate method.
+        if(_conn != null) {
+            _conn.removeTrace(this);
+        }
+    }
 
-	/**
+    /**
      * Returns the CallableStatement to the pool.  If {{@link #isClosed()}, this is a No-op.
      */
     public void close() throws SQLException {
@@ -94,38 +94,38 @@
      * Activates after retrieval from the pool. Adds a trace for this CallableStatement to
the Connection
      * that created it.
      */
-	protected void activate() throws SQLException {
-		_closed = false;
-		if( _conn != null ) {
-			_conn.addTrace( this );
-		}
-		super.activate();
-	}
-
-	/**
-	 * Passivates to prepare for return to the pool.  Removes the trace associated with this
CallableStatement
-	 * from the Connection that created it.  Also closes any associated ResultSets.
-	 */
-	protected void passivate() throws SQLException {
-		_closed = true;
-		if( _conn != null ) {
-			_conn.removeTrace(this);
-		}
-
-		// The JDBC spec requires that a statment close any open
-		// ResultSet's when it is closed.
-		// FIXME The PreparedStatement we're wrapping should handle this for us.
-		// See DBCP-10 for what could happen when ResultSets are closed twice.
-		List resultSets = getTrace();
-		if(resultSets != null) {
-			ResultSet[] set = (ResultSet[])resultSets.toArray(new ResultSet[resultSets.size()]);
-			for(int i = 0; i < set.length; i++) {
-				set[i].close();
-			}
-			clearTrace();
-		}
+    protected void activate() throws SQLException {
+        _closed = false;
+        if( _conn != null ) {
+            _conn.addTrace( this );
+        }
+        super.activate();
+    }
 
-		super.passivate();
-	}
+    /**
+     * Passivates to prepare for return to the pool.  Removes the trace associated with this
CallableStatement
+     * from the Connection that created it.  Also closes any associated ResultSets.
+     */
+    protected void passivate() throws SQLException {
+        _closed = true;
+        if( _conn != null ) {
+            _conn.removeTrace(this);
+        }
+
+        // The JDBC spec requires that a statment close any open
+        // ResultSet's when it is closed.
+        // FIXME The PreparedStatement we're wrapping should handle this for us.
+        // See DBCP-10 for what could happen when ResultSets are closed twice.
+        List resultSets = getTrace();
+        if(resultSets != null) {
+            ResultSet[] set = (ResultSet[])resultSets.toArray(new ResultSet[resultSets.size()]);
+            for(int i = 0; i < set.length; i++) {
+                set[i].close();
+            }
+            clearTrace();
+        }
+
+        super.passivate();
+    }
 
 }

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java?rev=883002&r1=883001&r2=883002&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java Sat
Nov 21 21:42:48 2009
@@ -141,7 +141,7 @@
      * @throws SQLException
      * @since 1.3
      */
-	public CallableStatement prepareCall(String sql) throws SQLException {
+    public CallableStatement prepareCall(String sql) throws SQLException {
         try {
             return (CallableStatement) (_pstmtPool.borrowObject(createKey(sql, STATEMENT_CALLABLESTMT)));
         } catch (NoSuchElementException e) {
@@ -152,8 +152,8 @@
             throw new SQLNestedException("Borrow callableStatement from pool failed", e);
         }
     }
-	
-	/**
+    
+    /**
      * Create or obtain a {@link CallableStatement} from the pool.
      * 
      * @param sql the sql string used to define the CallableStatement
@@ -161,7 +161,7 @@
      * @throws SQLException
      * @since 1.3
      */
-	public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency)
throws SQLException {
+    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency)
throws SQLException {
         try {
             return (CallableStatement) (_pstmtPool.borrowObject(createKey(sql, resultSetType,
                             resultSetConcurrency, STATEMENT_CALLABLESTMT)));



Mime
View raw message