db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1371306 [1/2] - in /db/derby/code/trunk/java/client/org/apache/derby: client/ client/am/ client/net/ jdbc/
Date Thu, 09 Aug 2012 16:41:33 GMT
Author: kmarsden
Date: Thu Aug  9 16:41:32 2012
New Revision: 1371306

URL: http://svn.apache.org/viewvc?rev=1371306&view=rev
Log:
DERBY-5896 Change java/drda source code to use spaces instead of tabs and clean up tab creep in java/client

Change client tabs to spaces.


Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java
    db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection40.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/AsciiStream.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/FailedProperties40.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalDatabaseMetaData40.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Statement.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Types.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/CodePoint.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/EncodedInputStream.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAResource.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/Request.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource40.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver40.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource40.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java Thu Aug  9 16:41:32 2012
@@ -239,10 +239,10 @@ public class ClientPooledConnection impl
 
             
             if (!newPC_) {
-            	// DERBY-1144 changed the last parameter of this method to true
-            	// to reset the connection state to the default on 
-            	// PooledConnection.getConnection() otherwise the 
-            	// isolation level and holdability was not correct and out of sync with the server.
+                // DERBY-1144 changed the last parameter of this method to true
+                // to reset the connection state to the default on 
+                // PooledConnection.getConnection() otherwise the 
+                // isolation level and holdability was not correct and out of sync with the server.
                 physicalConnection_.reset(logWriter_);
             }
             else {
@@ -371,9 +371,9 @@ public class ClientPooledConnection impl
      * @param exception the exception that occurred on the connection
      */
     public void informListeners(SqlException exception) {
-		// only report fatal error  
-		if (exception.getErrorCode() < ExceptionSeverity.SESSION_SEVERITY)
-			return;
+        // only report fatal error  
+        if (exception.getErrorCode() < ExceptionSeverity.SESSION_SEVERITY)
+            return;
 
         synchronized (this) {
             fireConnectionEventListeners(exception);

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection40.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection40.java Thu Aug  9 16:41:32 2012
@@ -63,7 +63,7 @@ public class ClientXAConnection40 extend
      * <code>PreparedStatement</code> has been closed or is invalid.
      * <p>
      *
-     * @param listener	the component which implements the
+     * @param listener    the component which implements the
      * <code>StatementEventListener</code> interface that was previously
      * registered with this <code>PooledConnection</code> object
      * <p>
@@ -82,7 +82,7 @@ public class ClientXAConnection40 extend
      * to register a <code>StatementEventListener</code> with this <code>PooledConnection</code> object.
      * <p>
      *
-     * @param listener	an component which implements the 
+     * @param listener    an component which implements the 
      *      <code>StatementEventListener</code> interface that is to be 
      *      registered with this <code>PooledConnection</code> object
      * <p>

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/AsciiStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/AsciiStream.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/AsciiStream.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/AsciiStream.java Thu Aug  9 16:41:32 2012
@@ -26,11 +26,11 @@ public class AsciiStream extends java.io
     private java.io.Reader reader_;
     private String materializedString_;
     private int charsRead_ = 0;
-	
-	public AsciiStream(String materializedString){
-		this(materializedString,new StringReader(materializedString));
-	}
-	
+    
+    public AsciiStream(String materializedString){
+        this(materializedString,new StringReader(materializedString));
+    }
+    
     public AsciiStream(String materializedString, java.io.Reader reader) {
         reader_ = reader;
         materializedString_ = materializedString;
@@ -41,11 +41,11 @@ public class AsciiStream extends java.io
         ++charsRead_;
         if (oneChar != -1) // if not eos
         {
-		if(oneChar <= 0x00ff)
-			return oneChar;
-		else
-			return 0x003f;
-		
+        if(oneChar <= 0x00ff)
+            return oneChar;
+        else
+            return 0x003f;
+        
         } else {
             return -1; // end of stream
         }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java Thu Aug  9 16:41:32 2012
@@ -28,90 +28,90 @@ import java.io.IOException;
 import org.apache.derby.shared.common.reference.MessageId;
 
 class CloseFilterInputStream extends FilterInputStream {
-	
-	private static final String ALREADY_CLOSED_ERR_MESSAGE = 
+    
+    private static final String ALREADY_CLOSED_ERR_MESSAGE = 
             SqlException.getMessageUtil().getTextMessage(
                 MessageId.OBJECT_CLOSED);
-	
-	private boolean closed;
-	
-	public CloseFilterInputStream(InputStream is){
-		
-		super(is);
-		closed = false;
-		
-	}
-	
-	
-	public int read() 
-		throws IOException {
-
-		if(closed){
-			throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
-		}
-		
-		return super.read();
-		
-	}
-	
-
-	public int read(byte[] b) 
-		throws IOException {
-		
-		if(closed){
-			throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
-		}
-
-		return super.read(b);
-
-	}
-	
-	
-	public int read(byte[] b,
-			int off,
-			int len) 
-		throws IOException{
-		
-		if(closed){
-			throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
-		}
-
-		return super.read(b, off, len);
-
-	}
-
-	
-	public long skip(long n)
-		throws IOException{
-
-		if(closed){
-			throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
-		}
-		
-		return super.skip(n);
-		
-	}
-	
-	
-	public int available()
-		throws IOException{
-		
-		if(closed){
-			throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
-		}
-
-		return super.available();
-		
-	}
-	
-	
-	public void close()
-		throws IOException{
-		
-		super.close();
-		closed = true;
-		
-	}
-	
-	
+    
+    private boolean closed;
+    
+    public CloseFilterInputStream(InputStream is){
+        
+        super(is);
+        closed = false;
+        
+    }
+    
+    
+    public int read() 
+        throws IOException {
+
+        if(closed){
+            throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
+        }
+        
+        return super.read();
+        
+    }
+    
+
+    public int read(byte[] b) 
+        throws IOException {
+        
+        if(closed){
+            throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
+        }
+
+        return super.read(b);
+
+    }
+    
+    
+    public int read(byte[] b,
+            int off,
+            int len) 
+        throws IOException{
+        
+        if(closed){
+            throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
+        }
+
+        return super.read(b, off, len);
+
+    }
+
+    
+    public long skip(long n)
+        throws IOException{
+
+        if(closed){
+            throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
+        }
+        
+        return super.skip(n);
+        
+    }
+    
+    
+    public int available()
+        throws IOException{
+        
+        if(closed){
+            throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
+        }
+
+        return super.available();
+        
+    }
+    
+    
+    public void close()
+        throws IOException{
+        
+        super.close();
+        closed = true;
+        
+    }
+    
+    
 }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java Thu Aug  9 16:41:32 2012
@@ -111,7 +111,7 @@ public class ColumnMetaData implements j
         // agent_.checkForDeferredExceptions();
         if (statementClosed_) {
             throw new SqlException(logWriter_, 
-            		new ClientMessageId (SQLState.LANG_STATEMENT_CLOSED_NO_REASON));
+                    new ClientMessageId (SQLState.LANG_STATEMENT_CLOSED_NO_REASON));
         }
     }
 
@@ -297,13 +297,13 @@ public class ColumnMetaData implements j
                 return 22;
             case Types.DECIMAL:
             case java.sql.Types.NUMERIC:
-		// There are 3 possible cases with respect to finding the correct max width for DECIMAL type.
-		// 1. If scale = 0, only sign should be added to precision.
-		// 2. scale = precision, 3 should be added to precision for sign, decimal and an additional char '0'.
-		// 3. precision > scale > 0, 2 should be added to precision for sign and decimal.
-		int scale = getScale(column);
-		int precision = getPrecision(column);
-		return (scale == 0) ? (precision + 1) : ((scale == precision) ? (precision + 3) : (precision + 2));
+        // There are 3 possible cases with respect to finding the correct max width for DECIMAL type.
+        // 1. If scale = 0, only sign should be added to precision.
+        // 2. scale = precision, 3 should be added to precision for sign, decimal and an additional char '0'.
+        // 3. precision > scale > 0, 2 should be added to precision for sign and decimal.
+        int scale = getScale(column);
+        int precision = getPrecision(column);
+        return (scale == 0) ? (precision + 1) : ((scale == precision) ? (precision + 3) : (precision + 2));
             case Types.CHAR:
             case Types.VARCHAR:
             case Types.LONGVARCHAR:
@@ -321,16 +321,16 @@ public class ColumnMetaData implements j
             case Types.VARBINARY:
             case Types.LONGVARBINARY:
             case Types.BLOB:
-		// Derby-2425. For long length values, size overflows the int 
-		// range. In such cases, the size is limited to the max. int value
-		// This behavior is consistent with the same in Embedded mode.
-		int size = (int) (2 * sqlLength_[column - 1]);  // eg. "FF" represents just one byte
-		if ( size < 0 )
-		    size = Integer.MAX_VALUE;
+        // Derby-2425. For long length values, size overflows the int 
+        // range. In such cases, the size is limited to the max. int value
+        // This behavior is consistent with the same in Embedded mode.
+        int size = (int) (2 * sqlLength_[column - 1]);  // eg. "FF" represents just one byte
+        if ( size < 0 )
+            size = Integer.MAX_VALUE;
                 return size;
             default:
                 throw new SqlException(logWriter_, 
-                		new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
+                        new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
             }
         }
         catch ( SqlException e )
@@ -453,7 +453,7 @@ public class ColumnMetaData implements j
                 return JDBC30Translation.UNKNOWN_PRECISION;
             default:
                 throw new SqlException(logWriter_, 
-                		new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
+                        new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
             }
         }
         catch ( SqlException e )
@@ -611,7 +611,7 @@ public class ColumnMetaData implements j
                 return sqlUDTname_[ column - 1 ];
             default:
                 throw new SqlException(logWriter_, 
-                		new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
+                        new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
             }
         }
         catch ( SqlException e )
@@ -727,7 +727,7 @@ public class ColumnMetaData implements j
                 return sqlUDTclassName_[ column - 1 ];
             default:
                 throw new SqlException(logWriter_, 
-                		new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
+                        new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
             }
         }
         catch ( SqlException e )
@@ -742,8 +742,8 @@ public class ColumnMetaData implements j
     void checkForValidColumnIndex(int column) throws SqlException {
         if (column < 1 || column > columns_) {
             throw new SqlException(logWriter_, 
-            		new ClientMessageId (SQLState.LANG_INVALID_COLUMN_POSITION),
-            		column, columns_);
+                    new ClientMessageId (SQLState.LANG_INVALID_COLUMN_POSITION),
+                    column, columns_);
         }
     }
 
@@ -824,7 +824,7 @@ public class ColumnMetaData implements j
             }
         }
         throw new SqlException(logWriter_, 
-        		new ClientMessageId (SQLState.INVALID_COLUMN_NAME), columnName);
+                new ClientMessageId (SQLState.INVALID_COLUMN_NAME), columnName);
     }
 
     // assign ordinal position as the column name if null.

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java Thu Aug  9 16:41:32 2012
@@ -900,8 +900,8 @@ public abstract class Connection
     }
 
    /**
-    * 	Return true if the physical connection is still open.
-    * 	Might be logically closed but available for reuse.
+    *     Return true if the physical connection is still open.
+    *     Might be logically closed but available for reuse.
     *   @return true if physical connection still open
     */
     public boolean isPhysicalConnClosed() {
@@ -943,7 +943,7 @@ public abstract class Connection
         //and return here, otherwise setTransactionIsolation will commit 
         //the transaction which is not the intention.
         if (level == getTransactionIsolationX()) 
-	    return;
+        return;
 
         try {
             // Per jdbc spec (see java.sql.Connection.close() javadoc).
@@ -1060,11 +1060,11 @@ public abstract class Connection
     }
 
     public int getTransactionIsolationX() throws SQLException {
-    	// Store the current auto-commit value and use it to restore 
-    	// at the end of this method.
-    	boolean currentAutoCommit = autoCommit_;
-    	java.sql.ResultSet rs = null;
-    	
+        // Store the current auto-commit value and use it to restore 
+        // at the end of this method.
+        boolean currentAutoCommit = autoCommit_;
+        java.sql.ResultSet rs = null;
+        
         try
         {
             checkForClosedConnection();
@@ -1097,8 +1097,8 @@ public abstract class Connection
             // cached isolation level to TRANSACTION_UNKNOWN which will trigger
             // a refresh from the server.
             if (getTransactionIsolationStmt == null  || 
-            		!(getTransactionIsolationStmt.openOnClient_ &&
-            				getTransactionIsolationStmt.openOnServer_)) {
+                    !(getTransactionIsolationStmt.openOnClient_ &&
+                            getTransactionIsolationStmt.openOnServer_)) {
                 getTransactionIsolationStmt =
                         createStatementX(java.sql.ResultSet.TYPE_FORWARD_ONLY,
                                 java.sql.ResultSet.CONCUR_READ_ONLY,
@@ -1130,7 +1130,7 @@ public abstract class Connection
                         (isolation_ == TRANSACTION_UNKNOWN),
                         "isolation_ modified when caching is not supported");
             }
-            rs.close();	
+            rs.close();    
             // So... of we did not have an active transaction before
             // the query, we pretend to still not have an open
             // transaction. The result set is closed, so this should
@@ -1144,10 +1144,10 @@ public abstract class Connection
             throw se.getSQLException();
         }
         finally {
-        	// Restore auto-commit value
-        	autoCommit_ = currentAutoCommit;
-        	if(rs != null)
-        		rs.close();
+            // Restore auto-commit value
+            autoCommit_ = currentAutoCommit;
+            if(rs != null)
+                rs.close();
         }
     }
   
@@ -1201,16 +1201,16 @@ public abstract class Connection
      * @return isolation level as a JDBC integer value 
      */
     private int translateIsolation(String isolationStr) {
-    	if(isolationStr.compareTo(DERBY_TRANSACTION_REPEATABLE_READ) == 0)
-    		return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
-    	else if (isolationStr.compareTo(DERBY_TRANSACTION_SERIALIZABLE) == 0)
-    		return java.sql.Connection.TRANSACTION_SERIALIZABLE;
-    	else if (isolationStr.compareTo(DERBY_TRANSACTION_READ_COMMITTED) == 0)
-    		return java.sql.Connection.TRANSACTION_READ_COMMITTED;
-    	else if (isolationStr.compareTo(DERBY_TRANSACTION_READ_UNCOMMITTED) == 0)
-    		return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
-    	else 
-    		return java.sql.Connection.TRANSACTION_NONE;
+        if(isolationStr.compareTo(DERBY_TRANSACTION_REPEATABLE_READ) == 0)
+            return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+        else if (isolationStr.compareTo(DERBY_TRANSACTION_SERIALIZABLE) == 0)
+            return java.sql.Connection.TRANSACTION_SERIALIZABLE;
+        else if (isolationStr.compareTo(DERBY_TRANSACTION_READ_COMMITTED) == 0)
+            return java.sql.Connection.TRANSACTION_READ_COMMITTED;
+        else if (isolationStr.compareTo(DERBY_TRANSACTION_READ_UNCOMMITTED) == 0)
+            return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+        else 
+            return java.sql.Connection.TRANSACTION_NONE;
     }
 
     public java.sql.SQLWarning getWarnings() throws SQLException {
@@ -1594,21 +1594,21 @@ public abstract class Connection
             if (savepoint == null) // Throw exception if savepoint is null
             {
                 throw new SqlException(agent_.logWriter_, 
-                		new ClientMessageId (SQLState.XACT_SAVEPOINT_RELEASE_ROLLBACK_FAIL));
+                        new ClientMessageId (SQLState.XACT_SAVEPOINT_RELEASE_ROLLBACK_FAIL));
             } else if (autoCommit_) // Throw exception if auto-commit is on
             {
                 throw new SqlException(agent_.logWriter_, 
-                		new ClientMessageId (SQLState.NO_SAVEPOINT_ROLLBACK_OR_RELEASE_WHEN_AUTO));
+                        new ClientMessageId (SQLState.NO_SAVEPOINT_ROLLBACK_OR_RELEASE_WHEN_AUTO));
             } 
             // Only allow to rollback to a savepoint from the connection that create the savepoint.
             try {
                 if (this != ((Savepoint) savepoint).agent_.connection_) {
                     throw new SqlException(agent_.logWriter_,
-                    		new ClientMessageId (SQLState.SAVEPOINT_NOT_CREATED_BY_CONNECTION));
+                            new ClientMessageId (SQLState.SAVEPOINT_NOT_CREATED_BY_CONNECTION));
                 }
             } catch (java.lang.ClassCastException e) { // savepoint is not an instance of am.Savepoint
                 throw new SqlException(agent_.logWriter_,
-                		new ClientMessageId (SQLState.SAVEPOINT_NOT_CREATED_BY_CONNECTION));
+                        new ClientMessageId (SQLState.SAVEPOINT_NOT_CREATED_BY_CONNECTION));
             }
 
             // Construct and flow a savepoint rollback statement to server.
@@ -2301,7 +2301,7 @@ public abstract class Connection
         if (!open_) {
             agent_.checkForDeferredExceptions();
             throw new SqlException(agent_.logWriter_, 
-            		new ClientMessageId (SQLState.NO_CURRENT_CONNECTION));
+                    new ClientMessageId (SQLState.NO_CURRENT_CONNECTION));
         } else {
             agent_.checkForDeferredExceptions();
         }
@@ -2496,7 +2496,7 @@ public abstract class Connection
      * Get the name of the current schema.
      */
     public String   getSchema() throws SQLException
-	{
+    {
         return getCurrentSchemaName();
     }
     
@@ -2504,7 +2504,7 @@ public abstract class Connection
      * Set the default schema for the Connection.
      */
     public void   setSchema(  String schemaName ) throws SQLException
-	{
+    {
         try {
             checkForClosedConnection();
         } catch (SqlException se) {
@@ -2527,6 +2527,6 @@ public abstract class Connection
         {
             if ( ps != null ) { ps.close(); }
         }
-	}
+    }
 
 }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java Thu Aug  9 16:41:32 2012
@@ -771,7 +771,7 @@ final class CrossConverters {
             if (length != CrossConverters.UNKNOWN_LENGTH &&
                     length != totalRead) {
                 throw new SqlException(agent_.logWriter_, 
-                		new ClientMessageId (SQLState.READER_UNDER_RUN));
+                        new ClientMessageId (SQLState.READER_UNDER_RUN));
             }
             return sw.toString();
         } catch (java.io.IOException e) {
@@ -827,7 +827,7 @@ final class CrossConverters {
             if (length != CrossConverters.UNKNOWN_LENGTH &&
                     length != totalRead) {
                 throw new SqlException(agent_.logWriter_, 
-                		new ClientMessageId (SQLState.READER_UNDER_RUN));
+                        new ClientMessageId (SQLState.READER_UNDER_RUN));
             }
 
             return new String(baos.toByteArray(), encoding);
@@ -887,7 +887,7 @@ final class CrossConverters {
             if (length != CrossConverters.UNKNOWN_LENGTH &&
                     length != totalRead) {
                 throw new SqlException(agent_.logWriter_,
-                		new ClientMessageId (SQLState.READER_UNDER_RUN));
+                        new ClientMessageId (SQLState.READER_UNDER_RUN));
             }
         } catch (java.io.IOException e) {
             throw SqlException.javaException(agent_.logWriter_, e);
@@ -1074,8 +1074,8 @@ final class CrossConverters {
             return parseByte(source);
         } catch (java.lang.NumberFormatException e) {
             throw new SqlException(agent_.logWriter_, 
-            		new ClientMessageId 
-            		(SQLState.LANG_FORMAT_EXCEPTION), "byte", e);
+                    new ClientMessageId 
+                    (SQLState.LANG_FORMAT_EXCEPTION), "byte", e);
         }
     }
 
@@ -1130,9 +1130,9 @@ final class CrossConverters {
             return parseShort(source);
         } catch (java.lang.NumberFormatException e) {
             throw new SqlException(agent_.logWriter_, 
-            		new ClientMessageId 
-            		(SQLState.LANG_FORMAT_EXCEPTION), 
-            		"short", e);
+                    new ClientMessageId 
+                    (SQLState.LANG_FORMAT_EXCEPTION), 
+                    "short", e);
         }
     }
 
@@ -1177,8 +1177,8 @@ final class CrossConverters {
             return parseInt(source);
         } catch (java.lang.NumberFormatException e) {
             throw new SqlException(agent_.logWriter_, 
-            		new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
-            		"int", e);
+                    new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
+                    "int", e);
         }
     }
 
@@ -1213,8 +1213,8 @@ final class CrossConverters {
             return parseLong(source);
         } catch (java.lang.NumberFormatException e) {
             throw new SqlException(agent_.logWriter_, 
-            		new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
-        			"long", e);
+                    new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
+                    "long", e);
         }
     }
 
@@ -1239,7 +1239,7 @@ final class CrossConverters {
             return Float.parseFloat(source.trim());
         } catch (java.lang.NumberFormatException e) {
             throw new SqlException(agent_.logWriter_, 
-            		new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
+                    new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
                     "float", e);
         }
     }
@@ -1255,7 +1255,7 @@ final class CrossConverters {
             return Double.parseDouble(source.trim());
         } catch (java.lang.NumberFormatException e) {
             throw new SqlException(agent_.logWriter_, 
-            		new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
+                    new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
                     "double", e);
         }
     }
@@ -1273,7 +1273,7 @@ final class CrossConverters {
             return new java.math.BigDecimal(source.trim());
         } catch (java.lang.NumberFormatException e) {
             throw new SqlException(agent_.logWriter_,
-            		new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
+                    new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
                     "java.math.BigDecimal", e);
         }
     }
@@ -1308,7 +1308,7 @@ final class CrossConverters {
             return date_valueOf(source, cal);
         } catch (java.lang.IllegalArgumentException e) { // subsumes NumberFormatException
             throw new SqlException(agent_.logWriter_, 
-            		new ClientMessageId (SQLState.LANG_DATE_SYNTAX_EXCEPTION), e);
+                    new ClientMessageId (SQLState.LANG_DATE_SYNTAX_EXCEPTION), e);
         }
     }
 
@@ -1328,7 +1328,7 @@ final class CrossConverters {
             return time_valueOf(source, cal);
         } catch (java.lang.IllegalArgumentException e) { // subsumes NumberFormatException
             throw new SqlException(agent_.logWriter_, 
-            		new ClientMessageId (SQLState.LANG_DATE_SYNTAX_EXCEPTION), e);
+                    new ClientMessageId (SQLState.LANG_DATE_SYNTAX_EXCEPTION), e);
         }
     }
 
@@ -1344,7 +1344,7 @@ final class CrossConverters {
             return timestamp_valueOf(source, cal);
         } catch (java.lang.IllegalArgumentException e) {  // subsumes NumberFormatException
             throw new SqlException(agent_.logWriter_, 
-            		new ClientMessageId (SQLState.LANG_DATE_SYNTAX_EXCEPTION), e);
+                    new ClientMessageId (SQLState.LANG_DATE_SYNTAX_EXCEPTION), e);
         }
     }
 
@@ -1700,7 +1700,7 @@ final class CrossConverters {
         if (negative) {
             if (i > 1) {
                 return result;
-            } else {	// Only got "-"
+            } else {    // Only got "-"
                 throw new NumberFormatException(s);
             }
         } else {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java Thu Aug  9 16:41:32 2012
@@ -446,8 +446,8 @@ public abstract class Cursor {
                     tempString.substring(0, java.lang.Math.min(maxFieldSize_, tempString.length()));
         } catch (java.io.UnsupportedEncodingException e) {
             throw new SqlException(agent_.logWriter_, 
-            		new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
-            		"VARCHAR", "String", e);
+                    new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
+                    "VARCHAR", "String", e);
         }
     }
 
@@ -1138,8 +1138,8 @@ public abstract class Cursor {
                     return new java.io.ByteArrayInputStream(getCHAR(column).getBytes("ISO-8859-1"));
                 } catch (java.io.UnsupportedEncodingException e) {
                     throw new SqlException(agent_.logWriter_, 
-                    		new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
-                    		"CHAR", "java.io.InputStream", e);
+                            new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
+                            "CHAR", "java.io.InputStream", e);
                 }
             case java.sql.Types.VARCHAR:
             case java.sql.Types.LONGVARCHAR:
@@ -1147,8 +1147,8 @@ public abstract class Cursor {
                     return new java.io.ByteArrayInputStream(getVARCHAR(column).getBytes("ISO-8859-1"));
                 } catch (java.io.UnsupportedEncodingException e) {
                     throw new SqlException(agent_.logWriter_, 
-                    		new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
-                    		"VARCHAR/LONGVARCHAR", "java.io.InputStream", e);
+                            new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
+                            "VARCHAR/LONGVARCHAR", "java.io.InputStream", e);
                 }
             case java.sql.Types.BINARY:
                 return new java.io.ByteArrayInputStream(get_CHAR_FOR_BIT_DATA(column));
@@ -1173,8 +1173,8 @@ public abstract class Cursor {
                         return new java.io.ByteArrayInputStream(s.getBytes("UTF-8"));
                     } catch (java.io.UnsupportedEncodingException e) {
                         throw new SqlException(agent_.logWriter_, 
-                        		new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
-                        		"CLOB", "UnicodeStream", e);
+                                new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
+                                "CLOB", "UnicodeStream", e);
                     }
                 }
             case java.sql.Types.CHAR:
@@ -1183,8 +1183,8 @@ public abstract class Cursor {
                         return new java.io.ByteArrayInputStream(getCHAR(column).getBytes("UTF-8"));
                     } catch (java.io.UnsupportedEncodingException e) {
                         throw new SqlException(agent_.logWriter_, 
-                        		new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
-                        		"CHAR", "UnicodeStream", e);
+                                new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
+                                "CHAR", "UnicodeStream", e);
                     }
                 }
             case java.sql.Types.VARCHAR:
@@ -1193,8 +1193,8 @@ public abstract class Cursor {
                     return new java.io.ByteArrayInputStream(getVARCHAR(column).getBytes("UTF-8"));
                 } catch (java.io.UnsupportedEncodingException e) {
                     throw new SqlException(agent_.logWriter_, 
-                    		new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
-                    		"VARCHAR/LONGVARCHAR", "UnicodeStream", e);
+                            new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
+                            "VARCHAR/LONGVARCHAR", "UnicodeStream", e);
                 }
             case java.sql.Types.BINARY:
                 return new java.io.ByteArrayInputStream(get_CHAR_FOR_BIT_DATA(column));
@@ -1234,8 +1234,8 @@ public abstract class Cursor {
                     return new java.io.InputStreamReader(new java.io.ByteArrayInputStream(get_CHAR_FOR_BIT_DATA(column)), "UTF-16BE");
                 } catch (java.io.UnsupportedEncodingException e) {
                     throw new SqlException(agent_.logWriter_, 
-                    		new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
-                    		"BINARY", "java.io.Reader", e);
+                            new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
+                            "BINARY", "java.io.Reader", e);
                 }
             case java.sql.Types.VARBINARY:
             case java.sql.Types.LONGVARBINARY:
@@ -1243,8 +1243,8 @@ public abstract class Cursor {
                     return new java.io.InputStreamReader(new java.io.ByteArrayInputStream(get_VARCHAR_FOR_BIT_DATA(column)), "UTF-16BE");
                 } catch (java.io.UnsupportedEncodingException e) {
                     throw new SqlException(agent_.logWriter_, 
-                    		new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
-                    		"VARBINARY/LONGVARBINARY", "java.io.Reader", e);
+                            new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
+                            "VARBINARY/LONGVARBINARY", "java.io.Reader", e);
                 }
             case java.sql.Types.BLOB:
                 try {
@@ -1252,8 +1252,8 @@ public abstract class Cursor {
                                                          "UTF-16BE");
                 } catch (java.io.UnsupportedEncodingException e) {
                     throw new SqlException(agent_.logWriter_, 
-                    		new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
-                    		"BLOB", "java.io.Reader", e);
+                            new ClientMessageId (SQLState.UNSUPPORTED_ENCODING), 
+                            "BLOB", "java.io.Reader", e);
                 }
             default:
                 throw coercionError( "java.io.Reader", column );

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/DatabaseMetaData.java Thu Aug  9 16:41:32 2012
@@ -2413,7 +2413,7 @@ public abstract class DatabaseMetaData i
     private boolean getMetaDataInfoBoolean(int infoCallIndex) throws SQLException {
         try
         {
-			if ( !metaDataInfoIsCached_) { metaDataInfoCall(); }
+            if ( !metaDataInfoIsCached_) { metaDataInfoCall(); }
 
             if ( serverSupportsBooleanValues() )
             {
@@ -2430,7 +2430,7 @@ public abstract class DatabaseMetaData i
         }
     }
 
-	private int getMetaDataInfoInt(int infoCallIndex) throws SQLException {
+    private int getMetaDataInfoInt(int infoCallIndex) throws SQLException {
         try
         {
             if (metaDataInfoIsCached_) {
@@ -2576,17 +2576,17 @@ public abstract class DatabaseMetaData i
         // The stored procured will return a String containing a list
         // of lists: For each result set type in the outer list, an
         // inner list gives the allowed concurrencies for that type:
-	// The encoding syntax is reproduced here from the server file
-	// 'metadata_net.properties (please keep in synch!):  
-	//
+    // The encoding syntax is reproduced here from the server file
+    // 'metadata_net.properties (please keep in synch!):  
+    //
         // String syntax:  
-	// <type> { "," <concurrency>}* { ";" <type> { "," <concurrency>}* }}*
-	//
-	// <type> ::= <the integer value for that type from interface java.sql.Resultset
-	//             i.e. TYPE_FORWARD_ONLY is 1003>
-	// <concurrency> ::= <the integer value for that concurrency
-	//                    from interface java.sql.Resultset, i.e.
-	//                    CONCUR_UPDATABLE is 1008>
+    // <type> { "," <concurrency>}* { ";" <type> { "," <concurrency>}* }}*
+    //
+    // <type> ::= <the integer value for that type from interface java.sql.Resultset
+    //             i.e. TYPE_FORWARD_ONLY is 1003>
+    // <concurrency> ::= <the integer value for that concurrency
+    //                    from interface java.sql.Resultset, i.e.
+    //                    CONCUR_UPDATABLE is 1008>
         try
         {
             String returnedFromSP = null;
@@ -2599,7 +2599,7 @@ public abstract class DatabaseMetaData i
             java.util.StringTokenizer st = new java.util.StringTokenizer(returnedFromSP, ";");
             while (st.hasMoreTokens()) {
                 java.util.StringTokenizer stForConc = 
-		    new java.util.StringTokenizer(st.nextToken(), ",");
+            new java.util.StringTokenizer(st.nextToken(), ",");
                 if ((Integer.parseInt(stForConc.nextToken())) == type) {
                     while (stForConc.hasMoreTokens()) {
                         if ((Integer.parseInt(stForConc.nextToken())) == concurrency) {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/EncryptionManager.java Thu Aug  9 16:41:32 2012
@@ -505,11 +505,11 @@ public class EncryptionManager {
      * Below are methods for the SECMEC_USRSSBPWD security mechanism.
      ****************************************************************/
 
-	/**
-	 * This method generates an 8-Byte random seed for the client (source).
-	 *
-	 * @return a random 8-Byte seed.
-	 */
+    /**
+     * This method generates an 8-Byte random seed for the client (source).
+     *
+     * @return a random 8-Byte seed.
+     */
     public byte[] generateSeed() {
         byte randomSeedBytes[] = new byte[SECMEC_USRSSBPWD_SEED_LEN];
         secureRandom.setSeed(secureRandom.generateSeed(
@@ -594,9 +594,9 @@ public class EncryptionManager {
 
         messageDigest.reset();
 
-		messageDigest.update(this.toHexByte(password, 0, password.length()));
-		byte[] encryptVal = messageDigest.digest();
-		String hexString = ID_PATTERN_NEW_SCHEME +
+        messageDigest.update(this.toHexByte(password, 0, password.length()));
+        byte[] encryptVal = messageDigest.digest();
+        String hexString = ID_PATTERN_NEW_SCHEME +
                      this.toHexString(encryptVal, 0, encryptVal.length);
 
         // Generate some 20-byte password token
@@ -639,15 +639,15 @@ public class EncryptionManager {
         The byte at <code>data[offset]</code> is represented by the first two
         characters in the returned String.
 
-        @param	data	byte array
-        @param	offset	starting byte (zero based) to convert.
-        @param	length	number of bytes to convert.
+        @param    data    byte array
+        @param    offset    starting byte (zero based) to convert.
+        @param    length    number of bytes to convert.
 
         @return the String (with hexidecimal format) form of the byte array
     */
     private String toHexString(byte[] data, int offset, int length)
     {
-		StringBuffer s = new StringBuffer(length*2);
+        StringBuffer s = new StringBuffer(length*2);
         int end = offset+length;
 
         for (int i = offset; i < end; i++)
@@ -672,9 +672,9 @@ public class EncryptionManager {
         The character at <code>str.charAt(0)</code> is represented by the first two bytes 
         in the returned String.
 
-        @param	str string 
-        @param	offset	starting character (zero based) to convert.
-        @param	length	number of characters to convert.
+        @param    str string 
+        @param    offset    starting character (zero based) to convert.
+        @param    length    number of characters to convert.
 
         @return the byte[]  (with hexidecimal format) form of the string (str) 
     */

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/FailedProperties40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/FailedProperties40.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/FailedProperties40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/FailedProperties40.java Thu Aug  9 16:41:32 2012
@@ -39,7 +39,7 @@ import java.sql.ClientInfoStatus;
      */
 public class FailedProperties40 {
     private final HashMap<String,ClientInfoStatus> failedProps_ = 
-	new HashMap<String,ClientInfoStatus>();
+    new HashMap<String,ClientInfoStatus>();
 
     private final String firstKey_;
     private final String firstValue_;
@@ -52,10 +52,10 @@ public class FailedProperties40 {
      * @return the created <code>Properties</code> object
      */
     public static Properties makeProperties(String name, String value) {
-	Properties p = new Properties();
+    Properties p = new Properties();
         if (name != null || value != null)
             p.setProperty(name, value);
-	return p;
+    return p;
     }
     
     /**

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java Thu Aug  9 16:41:32 2012
@@ -389,7 +389,7 @@ public abstract class Lob implements Uni
         }
 
         if(!isValid_ || (isLocator()  && 
-        		(transactionID_ != agent_.connection_.getTransactionID())))
+                (transactionID_ != agent_.connection_.getTransactionID())))
             throw new SqlException(null,new ClientMessageId(SQLState.LOB_OBJECT_INVALID))
                                                   .getSQLException();
     }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java Thu Aug  9 16:41:32 2012
@@ -1213,28 +1213,28 @@ public class LogWriter {
     }
 
     public static java.io.PrintWriter getPrintWriter(final String fileName, final boolean fileAppend) throws SqlException {
-    	java.io.PrintWriter printWriter = null;
-    	//Using an anonymous class to deal with the PrintWriter because the  
-    	//method java.security.AccessController.doPrivileged requires an 
-    	//instance of a class(which implements 
-    	//java.security.PrivilegedExceptionAction). Since getPrintWriter method
-    	//is static, we can't simply pass "this" to doPrivileged method and 
-    	//have LogWriter implement PrivilegedExceptionAction.
-    	//To get around the static nature of method getPrintWriter, have an
-    	//anonymous class implement PrivilegedExceptionAction. That class will 
-    	//do the work related to PrintWriter in it's run method and return 
-    	//PrintWriter object.
+        java.io.PrintWriter printWriter = null;
+        //Using an anonymous class to deal with the PrintWriter because the  
+        //method java.security.AccessController.doPrivileged requires an 
+        //instance of a class(which implements 
+        //java.security.PrivilegedExceptionAction). Since getPrintWriter method
+        //is static, we can't simply pass "this" to doPrivileged method and 
+        //have LogWriter implement PrivilegedExceptionAction.
+        //To get around the static nature of method getPrintWriter, have an
+        //anonymous class implement PrivilegedExceptionAction. That class will 
+        //do the work related to PrintWriter in it's run method and return 
+        //PrintWriter object.
         try {
             printWriter = AccessController.doPrivileged(
                 new PrivilegedExceptionAction<PrintWriter>(){
                     public PrintWriter run() throws IOException {
-    			        String fileCanonicalPath = new java.io.File(fileName).getCanonicalPath();
-    					return new java.io.PrintWriter(
-    							new java.io.BufferedOutputStream(
-    									new java.io.FileOutputStream(
-    											fileCanonicalPath, fileAppend), 4096), true);
-            			}
-            		});
+                        String fileCanonicalPath = new java.io.File(fileName).getCanonicalPath();
+                        return new java.io.PrintWriter(
+                                new java.io.BufferedOutputStream(
+                                        new java.io.FileOutputStream(
+                                                fileCanonicalPath, fileAppend), 4096), true);
+                        }
+                    });
         } catch (java.security.PrivilegedActionException pae) {
             throw new SqlException(null, 
                 new ClientMessageId(SQLState.UNABLE_TO_OPEN_FILE),
@@ -1268,7 +1268,7 @@ public class LogWriter {
                 }
                 
                 if(value != null)
-                	properties.setProperty(propertyKey, value);
+                    properties.setProperty(propertyKey, value);
             }
         } catch (NamingException e) {
             throw new SqlException(this, 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java Thu Aug  9 16:41:32 2012
@@ -167,32 +167,32 @@ public class LogicalConnection implement
      * 
      * @param sqle the cause of the notification
      */
-	final void notifyException(SQLException sqle) {
+    final void notifyException(SQLException sqle) {
         if (physicalConnection_ != null) 
-        	pooledConnection_.informListeners(new SqlException(sqle));
-	}
+            pooledConnection_.informListeners(new SqlException(sqle));
+    }
 
     // ---------------------- wrapped public entry points ------------------------
     // All methods are forwarded to the physical connection in a standard way
 
     synchronized public java.sql.Statement createStatement() throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.createStatement();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.createStatement();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public java.sql.PreparedStatement prepareStatement(String sql) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.prepareStatement(sql);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.prepareStatement(sql);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public PreparedStatement preparePositionedUpdateStatement(String sql, Section querySection) throws SqlException {
@@ -205,103 +205,103 @@ public class LogicalConnection implement
     }
 
     synchronized public java.sql.CallableStatement prepareCall(String sql) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.prepareCall(sql);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.prepareCall(sql);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public String nativeSQL(String sql) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.nativeSQL(sql);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.nativeSQL(sql);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public void setAutoCommit(boolean autoCommit) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        physicalConnection_.setAutoCommit(autoCommit);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            physicalConnection_.setAutoCommit(autoCommit);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public boolean getAutoCommit() throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.getAutoCommit();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.getAutoCommit();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public void commit() throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        physicalConnection_.commit();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            physicalConnection_.commit();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public void rollback() throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        physicalConnection_.rollback();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            physicalConnection_.rollback();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public void setTransactionIsolation(int level) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        physicalConnection_.setTransactionIsolation(level);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            physicalConnection_.setTransactionIsolation(level);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public int getTransactionIsolation() throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.getTransactionIsolation();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.getTransactionIsolation();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public java.sql.SQLWarning getWarnings() throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.getWarnings();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.getWarnings();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public void clearWarnings() throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        physicalConnection_.clearWarnings();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            physicalConnection_.clearWarnings();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     /**
@@ -321,17 +321,17 @@ public class LogicalConnection implement
      */
     public synchronized java.sql.DatabaseMetaData getMetaData()
             throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
+        try {
+            checkForNullPhysicalConnection();
             // Create metadata object on demand, then cache it for later use.
             if (this.logicalDatabaseMetaData == null) {
                 this.logicalDatabaseMetaData = newLogicalDatabaseMetaData();
             }
             return this.logicalDatabaseMetaData;
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     /**
@@ -371,227 +371,227 @@ public class LogicalConnection implement
     }
 
     synchronized public void setReadOnly(boolean readOnly) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        physicalConnection_.setReadOnly(readOnly);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            physicalConnection_.setReadOnly(readOnly);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public boolean isReadOnly() throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.isReadOnly();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.isReadOnly();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public void setCatalog(String catalog) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        physicalConnection_.setCatalog(catalog);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            physicalConnection_.setCatalog(catalog);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public String getCatalog() throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.getCatalog();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.getCatalog();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public java.sql.Statement createStatement(int resultSetType,
                                                            int resultSetConcurrency) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.createStatement(resultSetType, resultSetConcurrency);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.createStatement(resultSetType, resultSetConcurrency);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public java.sql.PreparedStatement prepareStatement(String sql,
                                                                     int resultSetType,
                                                                     int resultSetConcurrency) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.prepareStatement(sql, resultSetType, resultSetConcurrency);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.prepareStatement(sql, resultSetType, resultSetConcurrency);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public java.sql.CallableStatement prepareCall(String sql,
                                                                int resultSetType,
                                                                int resultSetConcurrency) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.prepareCall(sql, resultSetType, resultSetConcurrency);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.prepareCall(sql, resultSetType, resultSetConcurrency);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public Map<String, Class<?>> getTypeMap() throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.getTypeMap();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.getTypeMap();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public void setTypeMap(Map map) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        physicalConnection_.setTypeMap(map);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            physicalConnection_.setTypeMap(map);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public java.sql.Statement createStatement(int resultSetType, int resultSetConcurrency,
                                               int resultSetHoldability) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public java.sql.CallableStatement prepareCall(String sql, int resultSetType,
                                                   int resultSetConcurrency,
                                                   int resultSetHoldability) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public java.sql.PreparedStatement prepareStatement(String sql, int resultSetType,
                                                        int resultSetConcurrency, int resultSetHoldability)
             throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.prepareStatement(sql, resultSetType, resultSetConcurrency,
-	                resultSetHoldability);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.prepareStatement(sql, resultSetType, resultSetConcurrency,
+                    resultSetHoldability);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public java.sql.PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
             throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.prepareStatement(sql, autoGeneratedKeys);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.prepareStatement(sql, autoGeneratedKeys);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public java.sql.PreparedStatement prepareStatement(String sql, int columnIndexes[])
             throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.prepareStatement(sql, columnIndexes);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.prepareStatement(sql, columnIndexes);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public java.sql.PreparedStatement prepareStatement(String sql, String columnNames[])
             throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.prepareStatement(sql, columnNames);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.prepareStatement(sql, columnNames);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public void setHoldability(int holdability) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        physicalConnection_.setHoldability(holdability);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            physicalConnection_.setHoldability(holdability);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public int getHoldability() throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.getHoldability();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.getHoldability();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public java.sql.Savepoint setSavepoint() throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.setSavepoint();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.setSavepoint();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public java.sql.Savepoint setSavepoint(String name) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.setSavepoint(name);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.setSavepoint(name);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public void rollback(java.sql.Savepoint savepoint) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        physicalConnection_.rollback(savepoint);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            physicalConnection_.rollback(savepoint);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     synchronized public void releaseSavepoint(java.sql.Savepoint savepoint) throws SQLException {
-		try {
-	        checkForNullPhysicalConnection();
-	        physicalConnection_.releaseSavepoint(savepoint);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        try {
+            checkForNullPhysicalConnection();
+            physicalConnection_.releaseSavepoint(savepoint);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     /**
@@ -628,28 +628,28 @@ public class LogicalConnection implement
      * Get the name of the current schema.
      */
     synchronized public String   getSchema() throws SQLException
-	{
-		try {
-	        checkForNullPhysicalConnection();
-	        return physicalConnection_.getSchema();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+    {
+        try {
+            checkForNullPhysicalConnection();
+            return physicalConnection_.getSchema();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
     
     /**
      * Set the default schema for the Connection.
      */
     synchronized public void   setSchema(  String schemaName ) throws SQLException
-	{
-		try {
-	        checkForNullPhysicalConnection();
-	        physicalConnection_.setSchema( schemaName );
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+    {
+        try {
+            checkForNullPhysicalConnection();
+            physicalConnection_.setSchema( schemaName );
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
     
 }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java Thu Aug  9 16:41:32 2012
@@ -55,72 +55,72 @@ public class LogicalConnection40
         throws SQLException {
         try
         {
-    		checkForNullPhysicalConnection();
+            checkForNullPhysicalConnection();
             return physicalConnection_.createArrayOf( typeName, elements );
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
     
     public Blob createBlob()
         throws SQLException {
         try
         {
-    		checkForNullPhysicalConnection();
+            checkForNullPhysicalConnection();
             return physicalConnection_.createBlob();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     public Clob createClob()
         throws SQLException {
         try
         {
-    		checkForNullPhysicalConnection();
+            checkForNullPhysicalConnection();
             return physicalConnection_.createClob();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
     
     public NClob createNClob()
         throws SQLException {
         try
         {
-    		checkForNullPhysicalConnection();
+            checkForNullPhysicalConnection();
             return physicalConnection_.createNClob();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     public SQLXML createSQLXML()
         throws SQLException {
         try
         {
-    		checkForNullPhysicalConnection();
+            checkForNullPhysicalConnection();
             return physicalConnection_.createSQLXML();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     public Struct createStruct(String typeName, Object[] attributes)
         throws SQLException {
         try
         {
-    		checkForNullPhysicalConnection();
+            checkForNullPhysicalConnection();
             return physicalConnection_.createStruct( typeName, attributes );
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     /**
@@ -137,12 +137,12 @@ public class LogicalConnection40
         throws SQLException {
         try
         {
-        	checkForNullPhysicalConnection();
-        	return physicalConnection_.getClientInfo();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+            checkForNullPhysicalConnection();
+            return physicalConnection_.getClientInfo();
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
     
     /**
@@ -159,12 +159,12 @@ public class LogicalConnection40
         throws SQLException {
         try
         {
-        	checkForNullPhysicalConnection();
-        	return physicalConnection_.getClientInfo(name);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+            checkForNullPhysicalConnection();
+            return physicalConnection_.getClientInfo(name);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     /**
@@ -200,10 +200,10 @@ public class LogicalConnection40
                 return false;
             }
             return physicalConnection_.isValid(timeout);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
    
 
@@ -213,10 +213,10 @@ public class LogicalConnection40
         {
             checkForNullPhysicalConnection();
             return interfaces.isInstance(this);
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     /**
@@ -231,18 +231,18 @@ public class LogicalConnection40
         throws SQLClientInfoException {
         try
         {
-    		checkForNullPhysicalConnection(); 
-        	physicalConnection_.setClientInfo(properties);
+            checkForNullPhysicalConnection(); 
+            physicalConnection_.setClientInfo(properties);
         } catch (SQLClientInfoException cie) {
             notifyException(cie);
             throw cie;
-    	} catch (SQLException sqle) {
-    		notifyException(sqle);
-    	    throw new SQLClientInfoException
-    		(sqle.getMessage(), sqle.getSQLState(), 
-    				sqle.getErrorCode(),
-    				(new FailedProperties40(properties)).getProperties());
-    	}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw new SQLClientInfoException
+            (sqle.getMessage(), sqle.getSQLState(), 
+                    sqle.getErrorCode(),
+                    (new FailedProperties40(properties)).getProperties());
+        }
     }
     
     /**
@@ -257,20 +257,20 @@ public class LogicalConnection40
         throws SQLClientInfoException {
         try
         {
-    		checkForNullPhysicalConnection(); 
-        	physicalConnection_.setClientInfo(name, value);
+            checkForNullPhysicalConnection(); 
+            physicalConnection_.setClientInfo(name, value);
         } catch (SQLClientInfoException cie) {
             notifyException(cie);
             throw cie;
-    	} catch (SQLException sqle) {
-    		notifyException(sqle);
+        } catch (SQLException sqle) {
+            notifyException(sqle);
             throw new SQLClientInfoException
             (sqle.getMessage(), sqle.getSQLState(),
-            		sqle.getErrorCode(),
+                    sqle.getErrorCode(),
              new FailedProperties40
              (FailedProperties40.makeProperties
               (name,value)).getProperties());
-    	}
+        }
     }
     
     public <T>T unwrap(Class<T> interfaces)
@@ -286,10 +286,10 @@ public class LogicalConnection40
                                        new ClientMessageId(SQLState.UNABLE_TO_UNWRAP),
                                        interfaces).getSQLException();
             }
-    	} catch (SQLException sqle) {
-    		notifyException(sqle);
-    		throw sqle;
-    	}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
     
     ////////////////////////////////////////////////////////////////////
@@ -306,34 +306,34 @@ public class LogicalConnection40
             {
                 ((NetConnection40) physicalConnection_).abort( executor );
             }
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
 
     public int getNetworkTimeout() throws SQLException
     {
         try
         {
-    		checkForNullPhysicalConnection();
+            checkForNullPhysicalConnection();
             return ((NetConnection40) physicalConnection_).getNetworkTimeout();
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
     
     public void setNetworkTimeout( Executor executor, int milliseconds ) throws SQLException
     {
         try
         {
-    		checkForNullPhysicalConnection();
+            checkForNullPhysicalConnection();
             ((NetConnection40) physicalConnection_).setNetworkTimeout( executor, milliseconds );
-		} catch (SQLException sqle) {
-			notifyException(sqle);
-			throw sqle;
-		}
+        } catch (SQLException sqle) {
+            notifyException(sqle);
+            throw sqle;
+        }
     }
     
 } // End class LogicalConnection40

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalDatabaseMetaData40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalDatabaseMetaData40.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalDatabaseMetaData40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalDatabaseMetaData40.java Thu Aug  9 16:41:32 2012
@@ -119,16 +119,16 @@ public class LogicalDatabaseMetaData40
         return ((org.apache.derby.client.am.DatabaseMetaData) getRealMetaDataObject()).generatedKeyAlwaysReturned();
     }
 
-	/**
+    /**
     * See DatabaseMetaData javadoc. Empty ResultSet because Derby does
     * not support pseudo columns.
-	*/
-	public ResultSet getPseudoColumns
+    */
+    public ResultSet getPseudoColumns
         ( String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern )
         throws SQLException
-	{
-		return ((org.apache.derby.client.am.DatabaseMetaData) getRealMetaDataObject()).getPseudoColumns
+    {
+        return ((org.apache.derby.client.am.DatabaseMetaData) getRealMetaDataObject()).getPseudoColumns
             ( catalog, schemaPattern, tableNamePattern, columnNamePattern );
-	}
+    }
 
 }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java Thu Aug  9 16:41:32 2012
@@ -2218,11 +2218,11 @@ public class PreparedStatement extends S
         if (batchSize == 0) {
             return updateCounts;
         }
-		// The network client has a hard limit of 65,534 commands in a single
-		// DRDA request. This is because DRDA uses a 2-byte correlation ID,
-		// and the values 0 and 0xffff are reserved as special values. So
-		// that imposes an upper limit on the batch size we can support:
-		if (batchSize > 65534)
+        // The network client has a hard limit of 65,534 commands in a single
+        // DRDA request. This is because DRDA uses a 2-byte correlation ID,
+        // and the values 0 and 0xffff are reserved as special values. So
+        // that imposes an upper limit on the batch size we can support:
+        if (batchSize > 65534)
             throw new BatchUpdateException(agent_.logWriter_, 
                 new ClientMessageId(SQLState.TOO_MANY_COMMANDS_FOR_BATCH), 
                 65534, updateCounts);
@@ -2409,8 +2409,8 @@ public class PreparedStatement extends S
 
     void checkForValidParameterIndex(int parameterIndex) throws SqlException {
         if (parameterMetaData_ == null) 
-			throw new SqlException(agent_.logWriter_,
-					new ClientMessageId(SQLState.NO_INPUT_PARAMETERS));
+            throw new SqlException(agent_.logWriter_,
+                    new ClientMessageId(SQLState.NO_INPUT_PARAMETERS));
 
         if (parameterIndex < 1 || parameterIndex > parameterMetaData_.columns_) {
             throw new SqlException(agent_.logWriter_, 
@@ -2521,9 +2521,9 @@ public class PreparedStatement extends S
     protected void markClosed(boolean removeListener){
         if(pooledConnection_ != null)
             pooledConnection_.onStatementClose(this);
-    	super.markClosed(removeListener);
-    	
-    	if (parameterMetaData_ != null) {
+        super.markClosed(removeListener);
+        
+        if (parameterMetaData_ != null) {
             parameterMetaData_.markClosed();
             parameterMetaData_ = null;
         }
@@ -2537,7 +2537,7 @@ public class PreparedStatement extends S
         parameters_ = null;
 
         if(removeListener)
-        	connection_.CommitAndRollbackListeners_.remove(this);
+            connection_.CommitAndRollbackListeners_.remove(this);
     }
     
     // JDBC 4.0 methods

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java?rev=1371306&r1=1371305&r2=1371306&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java Thu Aug  9 16:41:32 2012
@@ -867,7 +867,7 @@ public abstract class ResultSet implemen
 
     // Live life on the edge and run unsynchronized
     public java.sql.Date getDate(int column, Calendar cal) throws SQLException {
-	    try
+        try
         {
             closeOpenStreams();
 
@@ -954,7 +954,7 @@ public abstract class ResultSet implemen
     // Live life on the edge and run unsynchronized
     public java.sql.Timestamp getTimestamp(int column, Calendar calendar)
             throws SQLException {
-	    try
+        try
         {
             closeOpenStreams();
 
@@ -1102,7 +1102,7 @@ public abstract class ResultSet implemen
 
     // Live life on the edge and run unsynchronized
     public byte[] getBytes(int column) throws SQLException {
-	    try
+        try
         {
             closeOpenStreams();
 
@@ -1340,7 +1340,7 @@ public abstract class ResultSet implemen
 
     // Live life on the edge and run unsynchronized
     public java.sql.Array getArray(int column) throws SQLException {
-	    try
+        try
         {
             closeOpenStreams();
 
@@ -3710,12 +3710,12 @@ public abstract class ResultSet implemen
     private void refreshRowX() throws SqlException {
         checkForClosedResultSet("refreshRow");
         checkThatResultSetTypeIsScrollable();
-	checkForUpdatableResultSet("refreshRow");
+    checkForUpdatableResultSet("refreshRow");
         if (isBeforeFirstX() || isAfterLastX() || isOnInsertRow_) {
             throw new SqlException(agent_.logWriter_,
                 new ClientMessageId(SQLState.NO_CURRENT_ROW));
         }
-	
+    
         // this method does nothing if ResultSet is TYPE_SCROLL_INSENSITIVE
         if (resultSetType_ == java.sql.ResultSet.TYPE_SCROLL_SENSITIVE) {
             isValidCursorPosition_ = getRefreshRowset();
@@ -4743,12 +4743,12 @@ public abstract class ResultSet implemen
     }
 
     private final void checkUpdatePreconditions(int column, 
-						String operation)
-	throws SqlException {
+                        String operation)
+    throws SqlException {
 
         checkForClosedResultSet(operation);
         checkForValidColumnIndex(column);
-	checkForUpdatableResultSet(operation);
+    checkForUpdatableResultSet(operation);
 
         if (!isOnCurrentRow_ && !isOnInsertRow_) {
             throw new SqlException(agent_.logWriter_, 
@@ -5458,27 +5458,27 @@ public abstract class ResultSet implemen
             Arrays.fill(rowsetSqlca_, null);
         }
     }
-	
-	
-	private CloseFilterInputStream createCloseFilterInputStream(java.io.InputStream is) throws SqlException {
-		
-		if(is == null){
-			return null;
-		}
-
-		if( currentStream == is ){
-			return currentStream;
-		}
-		
-		closeOpenStreams();
-		
-		currentStream = new CloseFilterInputStream(is);
-		
-		return currentStream;
-		
-	}
-	
-	
+    
+    
+    private CloseFilterInputStream createCloseFilterInputStream(java.io.InputStream is) throws SqlException {
+        
+        if(is == null){
+            return null;
+        }
+
+        if( currentStream == is ){
+            return currentStream;
+        }
+        
+        closeOpenStreams();
+        
+        currentStream = new CloseFilterInputStream(is);
+        
+        return currentStream;
+        
+    }
+    
+    
     /**
      * Closes the current stream, if there is one.
      * <p>



Mime
View raw message