A fix for jdbc regression test submitted yesterday by Kim Ho at Redhat

 Modified Files:
 	ResultSetTest.java

diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java
index 6a1803f4c2c62582398fd6551a913351e5822d85..d7e621e20c699eb1ba28dc168084da61a118987c 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java
@@ -229,10 +229,10 @@ public class ResultSetTest extends TestCase
        
        assertTrue(rs.next());
        assertEquals(-1,rs.getByte(1));
-       int count = 3;
        
        while (rs.next())
        {
+           thrown = false;
            try
            {
                rs.getByte(1);
@@ -243,10 +243,7 @@ public class ResultSetTest extends TestCase
            }
            if (!thrown)
                fail("Exception expected.");
-           count++;
        }
-       if (count != 9)
-           fail("Exception expected.");
    }
        
        public void testgetShort() throws Exception
@@ -262,10 +259,10 @@ public class ResultSetTest extends TestCase
        
        assertTrue(rs.next());
        assertEquals(-1,rs.getShort(1));
-       int count = 3;
        
        while (rs.next())
        {
+           thrown = false;
            try
            {
                rs.getShort(1);
@@ -276,10 +273,7 @@ public class ResultSetTest extends TestCase
            }
            if (!thrown)
                fail("Exception expected.");
-           count++;
        }
-       if (count != 9)
-           fail("Exception expected.");
    }
        
 }