db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1169686 - /db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
Date Mon, 12 Sep 2011 10:59:22 GMT
Author: kahatlen
Date: Mon Sep 12 10:59:21 2011
New Revision: 1169686

URL: http://svn.apache.org/viewvc?rev=1169686&view=rev
Log:
DERBY-5306: Remove dead methods (June 2011)

Backported the NetCursor part of the fix from trunk.

Modified:
    db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java   (contents,
props changed)

Modified: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java?rev=1169686&r1=1169685&r2=1169686&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java (original)
+++ db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java Mon
Sep 12 10:59:21 2011
@@ -430,28 +430,6 @@ public class NetCursor extends org.apach
         return i;
     }
 
-    // Reads 8-bytes from the dataBuffer from the current position.
-    // If position is already at the end of the buffer, send CNTQRY to get more 
-    // data.
-    private long readFdocaLong() throws 
-            org.apache.derby.client.am.DisconnectException, SqlException {
-        if ((position_ + 8) > lastValidBytePosition_) {
-            // Check for ENDQRYRM, throw SqlException if already received one.
-            checkAndThrowReceivedEndqryrm();
-
-            // Send CNTQRY to complete the row/rowset.
-            int lastValidByteBeforeFetch = completeSplitRow();
-
-            // if lastValidBytePosition_ has not changed, and an ENDQRYRM was 
-            // received, throw a SqlException for the ENDQRYRM.
-            checkAndThrowReceivedEndqryrm(lastValidByteBeforeFetch);
-        }
-
-        long i = SignedBinary.getLong(dataBuffer_, position_);
-        position_ += 8;
-        return i;
-    }
-        
     // Reads 1-byte from the dataBuffer from the current position.
     // If position is already at the end of the buffer, send CNTQRY to get more data.
     private int readFdocaOneByte() throws org.apache.derby.client.am.DisconnectException,
SqlException {

Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 12 10:59:21 2011
@@ -0,0 +1,2 @@
+/db/derby/code/branches/10.7/java/client/org/apache/derby/client/net/NetCursor.java:1061570,1061578,1082235
+/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1145961,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1163616,1164358,1164370,1165221



Mime
View raw message