db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r905621 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: tests/memory/ClobMemTest.java util/streams/LoopingAlphabetReader.java
Date Tue, 02 Feb 2010 13:17:45 GMT
Author: dag
Date: Tue Feb  2 13:17:43 2010
New Revision: 905621

URL: http://svn.apache.org/viewvc?rev=905621&view=rev
Log:
DERBY-4477 Selecting / projecting a column whose value is represented by a stream more than
once fails

Follow-up patch for an intermittet bug caused by previous insert, due
to newly filed DERBY-4531: derby-4477-lowmem-followup.


Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/streams/LoopingAlphabetReader.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java?rev=905621&r1=905620&r2=905621&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java
Tue Feb  2 13:17:43 2010
@@ -234,12 +234,12 @@
         rs.next();
         Reader is = rs.getCharacterStream(1);
 
-        stream.reopen();
+        stream = new LoopingAlphabetReader(blobLen);
         assertEquals(stream, is);
 
         is = rs.getCharacterStream(2);
 
-        stream.reopen();
+        stream = new LoopingAlphabetReader(blobLen);
         assertEquals(stream, is);
         rs.close();
 
@@ -249,11 +249,11 @@
         rs.next();
 
         is = rs.getCharacterStream(2);
-        stream.reopen();
+        stream = new LoopingAlphabetReader(blobLen);
         assertEquals(stream, is);
 
         is = rs.getCharacterStream(4);
-        stream.reopen();
+        stream = new LoopingAlphabetReader(blobLen);
         assertEquals(stream, is);
 
         // clean up

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/streams/LoopingAlphabetReader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/streams/LoopingAlphabetReader.java?rev=905621&r1=905620&r2=905621&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/streams/LoopingAlphabetReader.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/streams/LoopingAlphabetReader.java
Tue Feb  2 13:17:43 2010
@@ -177,15 +177,6 @@
     }
 
     /**
-     * Reopen the stream.
-     */
-    public void reopen()
-            throws IOException {
-        this.closed = false;
-        reset();
-    }
-
-    /**
      * Return remaining characters in the stream.
      */
     public int available() {



Mime
View raw message