db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r648180 - in /db/derby/code/trunk/java/client/org/apache/derby/client/am: Blob.java Clob.java Connection.java Lob.java
Date Tue, 15 Apr 2008 08:41:04 GMT
Author: kahatlen
Date: Tue Apr 15 01:41:03 2008
New Revision: 648180

URL: http://svn.apache.org/viewvc?rev=648180&view=rev
Log:
DERBY-3574: Clean up whitespace problems introduced in revision 647931
(trailing whitespace, extra blank lines, mixing tabs and spaces on the
same line)

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Blob.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Clob.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/Lob.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Blob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Blob.java?rev=648180&r1=648179&r2=648180&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Blob.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Blob.java Tue Apr 15 01:41:03
2008
@@ -29,9 +29,7 @@
 import org.apache.derby.shared.common.reference.SQLState;
 
 public class Blob extends Lob implements java.sql.Blob {
-    
-    
-    
+
     //-----------------------------state------------------------------------------
 
     byte[] binaryString_ = null;
@@ -610,7 +608,6 @@
         
         //now that free has been called the Blob object is no longer
         //valid
-        
         isValid_ = false;
         try {            
             synchronized (agent_.connection_) {
@@ -734,9 +731,6 @@
 
         return true;
     }
-    
-    
-    
 
     /**
      * Materialize the stream used for input to the database.

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Clob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Clob.java?rev=648180&r1=648179&r2=648180&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Clob.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Clob.java Tue Apr 15 01:41:03
2008
@@ -48,17 +48,12 @@
 
     protected String encoding_ = "UNICODE";
 
- 
-
-    
-    
     //---------------------constructors/finalizer---------------------------------
     public Clob(Agent agent, String string) {
 
         this(agent,
              false);
 
-                
         string_ = string;
         setSqlLength(string_.length());
         dataType_ |= STRING;
@@ -241,7 +236,6 @@
         }
     }
 
-    
   /**
    * Returns a copy of the specified substring
    * in the <code>CLOB</code> value

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=648180&r1=648179&r2=648180&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 Tue Apr 15
01:41:03 2008
@@ -118,7 +118,7 @@
     private boolean accumulated444ForMessageProcFailure_ = false;
 
     private int transactionID_ = 0;
-    
+
     //---------------------XA-----------------------------------------------------
 
     protected boolean isXAConnection_ = false; // Indicates an XA connection
@@ -561,7 +561,7 @@
             // internal code will call commitX which will ignore the commit request
             // while in a Global transaction
             checkForInvalidXAStateOnCommitOrRollback();
-            flowCommit();            
+            flowCommit();
         }
         catch ( SqlException se )
         {
@@ -1110,9 +1110,9 @@
      * @return the ID of the active transaction
      */
     public int getTransactionID(){
-    	return transactionID_;
+        return transactionID_;
     }
-    
+
     /**
      * Returns the current schema (the schema that would be used for
      * compilation. This is not part of the java.sql.Connection interface, and

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=648180&r1=648179&r2=648180&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 Tue Apr 15 01:41:03
2008
@@ -58,7 +58,7 @@
      * invalidated by calling free() on it
      */
     protected boolean isValid_ = true;
-    
+
     final private boolean willBeLayerBStreamed_;
     
         
@@ -76,7 +76,7 @@
      * This integer identifies which transaction the Lob is associated with
      */
     private int transactionID_;
-    
+
     //-----------------------------messageId------------------------------------------
     final static protected ClientMessageId LOB_OBJECT_LENGTH_UNKNOWN_YET =
         new ClientMessageId( SQLState.LOB_OBJECT_LENGTH_UNKNOWN_YET );
@@ -110,7 +110,7 @@
      */
     long sqlLength() throws SqlException 
     {
-    	if (lengthObtained_) return sqlLength_;
+        if (lengthObtained_) return sqlLength_;
         
         if (isLocator()) {
             sqlLength_ = getLocatorLength();
@@ -387,24 +387,23 @@
     }
     
     /**
-     * Checks is isValid is true and whether the transaction that
-     * created the Lob is still active. If any of which is not true throws 
+     * Checks if isValid is true and whether the transaction that
+     * created the Lob is still active. If any of which is not true throws
      * a SQLException stating that a method has been called on
-     * an invalid LOB object
+     * an invalid LOB object.
      *
-     * @throws SQLException if isValid is not true
+     * @throws SQLException if isValid is not true or the transaction that
+     * created the Lob is not active
      */
     protected void checkValidity() throws SQLException{
-    	
-    	/**
-    	 * If there isn't an open connection, the Lob is invalid.
-    	 */
-    	try{
-    		agent_.connection_.checkForClosedConnection();
-    	}catch(SqlException se){
-    		throw se.getSQLException();
-    	}
-    	
+
+        // If there isn't an open connection, the Lob is invalid.
+        try {
+            agent_.connection_.checkForClosedConnection();
+        } catch (SqlException se) {
+            throw se.getSQLException();
+        }
+
         if(!isValid_ || transactionID_ != agent_.connection_.getTransactionID())
             throw new SqlException(null,new ClientMessageId(SQLState.LOB_OBJECT_INVALID))
                                                   .getSQLException();



Mime
View raw message