db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1478635 [3/5] - in /db/derby/code/trunk/java: client/org/apache/derby/client/ client/org/apache/derby/client/am/ client/org/apache/derby/client/net/ client/org/apache/derby/jdbc/ engine/org/apache/derby/iapi/services/info/ testing/org/apac...
Date Fri, 03 May 2013 03:42:16 GMT
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/StatementCacheInteractor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/StatementCacheInteractor.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/StatementCacheInteractor.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/StatementCacheInteractor.java Fri May  3 03:42:14 2013
@@ -83,7 +83,7 @@ public final class StatementCacheInterac
     /**
      * @see java.sql.Connection#prepareStatement(String)
      */
-    public synchronized PreparedStatement prepareStatement(String sql)
+    synchronized PreparedStatement prepareStatement(String sql)
             throws SQLException {
         StatementKey stmtKey = StatementKeyFactory.newPrepared(
                 sql, physicalConnection.getCurrentSchemaName(),
@@ -98,7 +98,7 @@ public final class StatementCacheInterac
     /**
      * @see java.sql.Connection#prepareStatement(String,int,int)
      */
-    public synchronized PreparedStatement prepareStatement(
+    synchronized PreparedStatement prepareStatement(
                                                 String sql,
                                                 int resultSetType,
                                                 int resultSetConcurrency)
@@ -117,7 +117,7 @@ public final class StatementCacheInterac
     /**
      * @see java.sql.Connection#prepareStatement(String,int,int,int)
      */
-    public synchronized PreparedStatement prepareStatement(
+    synchronized PreparedStatement prepareStatement(
                                                 String sql,
                                                 int resultSetType,
                                                 int resultSetConcurrency,
@@ -138,7 +138,7 @@ public final class StatementCacheInterac
     /**
      * @see java.sql.Connection#prepareStatement(String,int)
      */
-    public synchronized PreparedStatement prepareStatement(
+    synchronized PreparedStatement prepareStatement(
                                                 String sql,
                                                 int autoGeneratedKeys)
             throws SQLException {
@@ -155,7 +155,7 @@ public final class StatementCacheInterac
     /**
      * @see java.sql.Connection#prepareCall(String)
      */
-    public synchronized CallableStatement prepareCall(String sql)
+    synchronized CallableStatement prepareCall(String sql)
             throws SQLException {
         StatementKey stmtKey = StatementKeyFactory.newCallable(
                 sql, physicalConnection.getCurrentSchemaName(),
@@ -172,7 +172,7 @@ public final class StatementCacheInterac
     /**
      * @see java.sql.Connection#prepareCall(String,int,int)
      */
-    public synchronized CallableStatement prepareCall(String sql,
+    synchronized CallableStatement prepareCall(String sql,
                                                       int resultSetType,
                                                       int resultSetConcurrency)
             throws SQLException {
@@ -191,7 +191,7 @@ public final class StatementCacheInterac
     /**
      * @see java.sql.Connection#prepareCall(String,int,int,int)
      */
-    public synchronized CallableStatement prepareCall(String sql,
+    synchronized CallableStatement prepareCall(String sql,
                                                       int resultSetType,
                                                       int resultSetConcurrency,
                                                       int resultSetHoldability)
@@ -233,7 +233,7 @@ public final class StatementCacheInterac
      *
      * @param logicalStmt the logical statement being closed
      */
-    public synchronized void markClosed(LogicalStatementEntity logicalStmt) {
+    synchronized void markClosed(LogicalStatementEntity logicalStmt) {
         // If we are not in the process of shutting down the logical connection,
         // remove the notifying statement from the list of open statements.
         if (!connCloseInProgress) {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveClobLocatorReader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveClobLocatorReader.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveClobLocatorReader.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/UpdateSensitiveClobLocatorReader.java Fri May  3 03:42:14 2013
@@ -32,7 +32,7 @@ import java.io.Reader;
  * this stream verifies that the underlying Clob has not
  * changed and if it has it recreates the specific streams.
  */
-public class UpdateSensitiveClobLocatorReader extends Reader {
+class UpdateSensitiveClobLocatorReader extends Reader {
     //The ClobLocatorReader instance
     //wrapped inside a BufferedReader
     private BufferedReader r = null;
@@ -216,7 +216,7 @@ public class UpdateSensitiveClobLocatorR
      * with the current position and the length
      * values if specified.
      */
-    protected Reader reCreateStream() throws SqlException {
+    private Reader reCreateStream() throws SqlException {
         Reader r_ = null;
         //Verify if a subset of the underlying
         //Clob data was requested.

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Utils.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Utils.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Utils.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Utils.java Fri May  3 03:42:14 2013
@@ -95,22 +95,6 @@ public final class Utils {
         return stringBuffer.toString();
     }
 
-    static String getStringFromStrings(String[] strings) {
-        if (strings == null) {
-            return "{}";
-        }
-        StringBuffer stringBuffer = new StringBuffer();
-        stringBuffer.append("{ ");
-        for (int i = 0; i < strings.length; i++) {
-            stringBuffer.append(strings[i]);
-            if (i != strings.length - 1) {
-                stringBuffer.append(", ");
-            }
-        }
-        stringBuffer.append(" }");
-        return stringBuffer.toString();
-    }
-
     static public int computeBigDecimalPrecision(BigDecimal decimal) {
         byte[] bBytes = decimal.unscaledValue().abs().toByteArray();
 
@@ -212,53 +196,6 @@ public final class Utils {
         {(byte) 0x7e, (byte) 0x37, (byte) 0xbe, (byte) 0x20, (byte) 0x22, (byte) 0xc0, (byte) 0x91, (byte) 0x4b, (byte) 0x26, (byte) 0x80, (byte) 0x00, (byte) 0x00, (byte) 0x00}  // 10^31
     };
 
-    // If the input string is short, pad it with blanks.
-    // If the input string is long, truncate it.
-    static public String padOrTruncate(String s, int fixedLength) {
-        if (s.length() >= fixedLength) // we need to truncate
-        {
-            return s.substring(0, fixedLength);
-        } else { // we need to pad
-            StringBuffer buffer = new StringBuffer(s);
-            for (int i = 0; i < fixedLength - s.length(); i++) {
-                buffer.append(" ");
-            }
-            return buffer.toString();
-        }
-    }
-
-    static public void checkForNegativePositiveSqlcard(
-            Sqlca sqlca,
-            ClientStatement statement) throws SqlException {
-
-        if (sqlca != null) {
-            int sqlcode = sqlca.getSqlCode();
-            if (sqlcode < 0) {
-                throw new SqlException(statement.agent_.logWriter_, sqlca);
-            } else {
-                if (sqlcode > 0) {
-                    statement.accumulateWarning(new SqlWarning(statement.agent_.logWriter_, sqlca));
-                }
-            }
-        }
-    }
-
-    static public void checkForNegativePositiveSqlcard(
-            Sqlca sqlca,
-            ClientResultSet resultSet) throws SqlException {
-
-        if (sqlca != null) {
-            int sqlcode = sqlca.getSqlCode();
-            if (sqlcode < 0) {
-                throw new SqlException(resultSet.agent_.logWriter_, sqlca);
-            } else {
-                if (sqlcode > 0) {
-                    resultSet.accumulateWarning(new SqlWarning(resultSet.agent_.logWriter_, sqlca));
-                }
-            }
-        }
-    }
-
     static public int getSqlcodeFromSqlca(Sqlca sqlca) {
         if (sqlca == null) {
             return 0;
@@ -266,14 +203,6 @@ public final class Utils {
         return sqlca.getSqlCode();
     }
 
-    static public long getUpdateCountFromSqlcard(Sqlca sqlca) {
-        if (sqlca == null) {
-            return 0;
-        } else {
-            return sqlca.getUpdateCount();
-        }
-    }
-
     /** Squash an array of longs into an array of ints */
     public static  int[]   squashLongs( long[] longs )
     {
@@ -305,68 +234,11 @@ public final class Utils {
         }
     }
 
-    // latestException is assumed to be non-null, accumulatedExceptions can be null
-    public static SqlWarning accumulateSQLWarning(SqlWarning latestException,
-                                                  SqlWarning accumulatedExceptions) {
-        latestException.setNextException(accumulatedExceptions);
-        return latestException;
-    }
-
-    // just a thought...
-    static String getSQLTypeName(int sqlType) {
-        switch (sqlType) {
-        case Types.BIGINT:
-            return "BIGINT";
-        case Types.BINARY:
-            return "BINARY";
-        case Types.BIT:
-            return "BIT";
-        case Types.CHAR:
-            return "CHAR";
-        case Types.DATE:
-            return "DATE";
-        case Types.DECIMAL:
-            return "DECIMAL";
-        case Types.DOUBLE:
-            return "DOUBLE";
-        case Types.REAL:
-            return "REAL";
-        case Types.INTEGER:
-            return "INTEGER";
-        case Types.LONGVARBINARY:
-            return "LONGVARBINARY";
-        case Types.LONGVARCHAR:
-            return "LONGVARCHAR";
-        case Types.NULL:
-            return "NULL";
-        case Types.NUMERIC:
-            return "NUMERIC";
-        case Types.OTHER:
-            return "OTHER";
-        case Types.FLOAT:
-            return "FLOAT";
-        case Types.SMALLINT:
-            return "SMALLINT";
-        case Types.TIME:
-            return "TIME";
-        case Types.TIMESTAMP:
-            return "TIMESTAMP";
-        case Types.TINYINT:
-            return "TINYINT";
-        case Types.VARBINARY:
-            return "VARBINARY";
-        case Types.VARCHAR:
-            return "VARCHAR";
-        default:
-            return null;
-        }
-    }
-
     public static boolean isSqlTypeNullable(int sqlType) {
         return (sqlType | 0x01) == sqlType;
     }
 
-    public static int getNonNullableSqlType(int sqlType) {
+    static int getNonNullableSqlType(int sqlType) {
         return sqlType & ~1;
     }
 }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Version.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Version.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Version.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Version.java Fri May  3 03:42:14 2013
@@ -30,13 +30,8 @@ import org.apache.derby.shared.common.re
 
 
 public abstract class Version {
-    static final MessageUtil msgutil = SqlException.getMessageUtil();
+    private static final MessageUtil msgutil = SqlException.getMessageUtil();
     
-    // Same as java.sql.DatabaseMetaData.getDriverName()
-    public static String getDriverName() {
-        return Configuration.dncDriverName;
-    }
-
     // for DatabaseMetaData.getDriverVersion()
     public static String getDriverVersion() {
         return Configuration.getProductVersionHolder().getVersionBuildString(true);
@@ -52,22 +47,10 @@ public abstract class Version {
         return Configuration.getProductVersionHolder().getMinorVersion();
     }
 
-    public static int getBuildNumber() {
-        return Configuration.getProductVersionHolder().getBuildNumberAsInt();
-    }
-
     public static int getProtocolMaintVersion() {
         return Configuration.getProductVersionHolder().getDrdaMaintVersion();
     }
 
-    public static boolean isAlpha() {
-        return Configuration.getProductVersionHolder().isAlpha();
-    }
-
-    public static boolean isBeta() {
-        return Configuration.getProductVersionHolder().isBeta();
-    }
-
     // Not an external, just a helper method
     private static String getDriverNameAndVersion() {
         return Configuration.dncDriverName + " " +
@@ -76,7 +59,7 @@ public abstract class Version {
 
     // -------------------------- configuration print stream ---------------------
 
-    public static void writeDriverConfiguration(PrintWriter printWriter) {
+    static void writeDriverConfiguration(PrintWriter printWriter) {
         String header = "[derby] ";
         synchronized (printWriter) {
             printWriter.println(header + "BEGIN TRACE_DRIVER_CONFIGURATION");

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/XaException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/XaException.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/XaException.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/XaException.java Fri May  3 03:42:14 2013
@@ -29,45 +29,6 @@ public class XaException extends XAExcep
 
     //-----------------constructors-----------------------------------------------
 
-    public XaException(LogWriter logWriter) {
-        super();
-        if (logWriter != null) {
-            logWriter.traceDiagnosable(this);
-        }
-    }
-
-    public XaException(LogWriter logWriter, Throwable throwable) {
-        super();
-        initCause(throwable);
-        if (logWriter != null) {
-            logWriter.traceDiagnosable(this);
-        }
-    }
-
-    public XaException(LogWriter logWriter, int errcode) {
-        super();
-        errorCode = errcode;
-        if (logWriter != null) {
-            logWriter.traceDiagnosable(this);
-        }
-    }
-
-    public XaException(LogWriter logWriter, Throwable throwable, int errcode) {
-        super();
-        errorCode = errcode;
-        initCause(throwable);
-        if (logWriter != null) {
-            logWriter.traceDiagnosable(this);
-        }
-    }
-
-    public XaException(LogWriter logWriter, String s) {
-        super(s);
-        if (logWriter != null) {
-            logWriter.traceDiagnosable(this);
-        }
-    }
-
     public XaException(LogWriter logWriter, Throwable throwable, String s) {
         super(s);
         initCause(throwable);
@@ -83,15 +44,6 @@ public class XaException extends XAExcep
     public void printTrace(PrintWriter printWriter, String header) {
         ExceptionFormatter.printTrace(this, printWriter, header);
     }
-
-    // Return a single XaException without the "next" pointing to another SQLException.
-    // Because the "next" is a private field in java.sql.SQLException,
-    // we have to create a new XaException in order to break the chain with "next" as null.
-    XaException copyAsUnchainedXAException(LogWriter logWriter) {
-        XaException xae = new XaException(logWriter, getCause(), getMessage());
-        xae.errorCode = this.errorCode;
-        return xae;
-    }
 }
 
 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/CcsidManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/CcsidManager.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/CcsidManager.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/CcsidManager.java Fri May  3 03:42:14 2013
@@ -29,8 +29,8 @@ import org.apache.derby.client.am.SqlExc
 // Performs character conversions as required to send and receive PROTOCOL control data.
 // User data uses the JVM's built in converters, i18n.jar,
 
-public abstract class CcsidManager {
-    public byte space_; // ' ' character
+abstract class CcsidManager {
+    byte space_; // ' ' character
     byte dot_;   // '.' character
 
     // Byte array used to convert numbers into
@@ -43,7 +43,7 @@ public abstract class CcsidManager {
     byte[] numToSnaRequiredCrrtknChar_;
 
     /* DRDA CCSID levels for UTF8 and EBCDIC */
-    public static final int UTF8_CCSID = 1208;
+    static final int UTF8_CCSID = 1208;
     
     CcsidManager(byte space,
                  byte dot,

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/CodePoint.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/CodePoint.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/CodePoint.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/CodePoint.java Fri May  3 03:42:14 2013
@@ -22,22 +22,7 @@
 package org.apache.derby.client.net;
 
 
-public class CodePoint {
-    public static final int FIXED_ROW_QUERY_PROTOCOL = 0;
-    public static final int LIMITED_BLOCK_QUERY_PROTOCOL = 1;
-    public static final int FORCE_FIXED_ROW_QUERY_PROTOCOL = 2;
-
-
-    // Character Subtype MBCS
-    static final int CSTMBCS = 0x2435;
-
-
-    // Force Fixed Row Query Protocol
-    static final int FRCFIXROW = 0x2410;
-
-    // Title
-    static final int TITLE = 0x0045;
-
+class CodePoint {
     // ---------------callable statement codepoints-------------------------------
 
     // PKGSNLST
@@ -59,12 +44,7 @@ public class CodePoint {
     // Result Set Flags
     static final int RSLSETFLG = 0x2142;
 
-    static final int RSLSETFLG_RETURN_NAMES = 0x80;
-
-    static final int RSLSETFLG_RETURN_LABELS = 0x40;
-
     // RSLSETFLGs added in SQLAM 7 for requesting standard, extended, or light sqldas
-    static final int RSLSETFLG_STANDARD_SQLDA = 0x00;
     static final int RSLSETFLG_EXTENDED_SQLDA = 0x04;
 
     // --------------------code points for constant ddm data----------------------
@@ -75,10 +55,6 @@ public class CodePoint {
     // Indicates true state.  This 1-byte code point is used by some DDM parameters.
     static final byte TRUE = -15;  // was 0xf1
 
-    // Zero indicator constant.
-    // Indicates data does flow.
-    static final int ZEROIND = 0x00;
-
     // FDOCA NULL indicator constant.
     // Indicates data does not flow.
     static final int NULLDATA = 0xFF;
@@ -89,12 +65,6 @@ public class CodePoint {
     // SECMEC value not supported.
     static final int SECCHKCD_01 = 0x01;
 
-    // Local security service info.
-    static final int SECCHKCD_08 = 0x08;
-
-    // Local security service retryable error.
-    static final int SECCHKCD_09 = 0x09;
-
     // Local security service non-retryable error.
     static final int SECCHKCD_0A = 0x0A;
 
@@ -127,42 +97,16 @@ public class CodePoint {
     // TYPSQLDA - Standard Output SQLDA
     static final int TYPSQLDA_STD_OUTPUT = 0;
 
-    // TYPSQLDA - Standard Input SQLDA
-    static final int TYPSQLDA_STD_INPUT = 1;
-
-    // TYPSQLDA - Light Output SQLDA
-    static final int TYPSQLDA_LIGHT_OUTPUT = 2;
-
-    // TYPSQLDA - Light Input SQLDA
-    static final int TYPSQLDA_LIGHT_INPUT = 3;
-
     // TYPSQLDA - Extended Output SQLDA
     static final int TYPSQLDA_X_OUTPUT = 4;
 
     // TYPSQLDA - Extended Input SQLDA
     static final int TYPSQLDA_X_INPUT = 5;
 
-    // QRYCLSIMP - Target Server determines whether to implicitly
-    // close the cursor or not upon SQLSTATE 02000 based on cursor type.
-    static final int QRYCLSIMP_SERVER_CHOICE = 0x00;
-
     // QRYCLSIMP - Target Server must implicitly close the cursor
     // upon SQLSTATE 02000.
     static final int QRYCLSIMP_YES = 0x01;
 
-    // QRYCLSIMP - Target Server must not implicitly close the cursor
-    // upon SQLSTATE 02000.
-    static final int QRYCLSIMP_NO = 0x02;
-
-    // SQL Error Diagnostic Level
-    // DIAGLVL0 A null SQLDIAGGRP is returned. This is the default.
-    // DIAGLVL1 A non-null SQLDIAGGRP should be returned.
-    // DIAGLVL2 A non-null SQLDIAGGRP should be returned, and both SQLDCMSG
-    // message text fields should be returned as null strings.
-    static final byte DIAGLVL0 = (byte)0xF0;
-    static final byte DIAGLVL1 = (byte)0xF1;
-    static final byte DIAGLVL2 = (byte)0xF2;
-
     // ----------------------ddm code points--------------------------------------
 
     // Exchange Server Attributes.
@@ -170,7 +114,7 @@ public class CodePoint {
 
 
     // Sync Point Control Request.
-    public final static int SYNCCTL = 0x1055;
+    final static int SYNCCTL = 0x1055;
 
     // Sync Point Resync Command.
     final static int SYNCRSY = 0x1069;
@@ -227,17 +171,17 @@ public class CodePoint {
     final static int SQLDTA = 0x2412;
 
     // SQL Data Reply Data.
-    public final static int SQLDTARD = 0x2413;
+    final static int SQLDTARD = 0x2413;
 
     // SQL Statement.
     final static int SQLSTT = 0x2414;
 
 
     // Query Answer Set Description.
-    public final static int QRYDSC = 0x241A;
+    final static int QRYDSC = 0x241A;
 
     // Query Answer Set Data.
-    public final static int QRYDTA = 0x241B;
+    final static int QRYDTA = 0x241B;
 
     // SQL Statement Attributes.
     final static int SQLATTR = 0x2450;
@@ -281,9 +225,6 @@ public class CodePoint {
     // Correlation Token codepoint constant.
     static final int CRRTKN = 0x2135;
 
-    // Description Error code
-    static final int DSCERRCD = 0x2101;
-
     // Server Attributes Reply Data codepoint constant.
     static final int EXCSATRD = 0x1443;
 
@@ -302,16 +243,9 @@ public class CodePoint {
     // Manager Level List codepoint constant.
     static final int MGRLVLLS = 0x1404;
 
-    // Manager Level Number Attribute constants.
-    // Specifies the level of a defined DDM manager.
-    static final int MGRLVLN = 0x1473;
-
     // Password
     static final int PASSWORD = 0x11A1;
 
-    // Package name & consistency token
-    static final int PKGNAMCT = 0x2112;
-
     // Conversational Protocol Error Code
     static final int PRCCNVCD = 0x113F;
 
@@ -372,9 +306,6 @@ public class CodePoint {
     // Query Returns Data.
     static final int QRYRTNDTA = 0x2155;
 
-    // Query Block Protocol Control
-    static final int QRYBLKCTL = 0x2132;
-
     // Query Block Size
     static final int QRYBLKSZ = 0x2114;
 
@@ -432,10 +363,10 @@ public class CodePoint {
     static final int SQLAM = 0x2407;
 
     // SQL Communication Area Reply Data codepoint constant.
-    public static final int SQLCARD = 0x2408;
+    static final int SQLCARD = 0x2408;
 
     // SQL Result Set Column Information Reply Data.
-    public static final int SQLCINRD = 0x240B;
+    static final int SQLCINRD = 0x240B;
 
     // Hold Cursor Position
     static final int SQLCSRHLD = 0x211F;
@@ -444,7 +375,7 @@ public class CodePoint {
     static final int SQLRSLRD = 0x240E;
 
     // SQLDA Reply Data codepoint constant.
-    public static final int SQLDARD = 0x2411;
+    static final int SQLDARD = 0x2411;
 
     // Server Class Name codepoint constant.
     static final int SRVCLSNM = 0x1147;
@@ -469,10 +400,10 @@ public class CodePoint {
     static final int SYNERRCD = 0x114A;
 
     // Data Type Definition Name codepoint constant.
-    public static final int TYPDEFNAM = 0x002F;
+    static final int TYPDEFNAM = 0x002F;
 
     // TYPDEF Overrides codepoint constant.
-    public static final int TYPDEFOVR = 0x0035;
+    static final int TYPDEFOVR = 0x0035;
 
     // Unit of Work Disposition codepoint constant.
     static final int UOWDSP = 0x2115;
@@ -493,19 +424,13 @@ public class CodePoint {
     // RDB Package Section Number
     static final int PKGSN = 0x210C;
 
-    // Scalar Data Length
-    static final int SCLDTALEN = 0x0100;
-
     // XA Manager
     static final int XAMGR = 0x1C01;
 
-    // SQL Error Diagnostic Level
-    static final int DIAGLVL = 0x2160;
-
     //-----------------------DDM reply codepoints---------------------------------
 
     // Command Check codepoint constant.
-    public static final int CMDCHKRM = 0x1254;
+    static final int CMDCHKRM = 0x1254;
 
     // Command Not Supported codepoint constant.
     static final int CMDNSPRM = 0x1250;
@@ -528,7 +453,7 @@ public class CodePoint {
     static final int OBJNSPRM = 0x1253;
 
     // Conversational Protocol Error
-    public static final int PRCCNVRM = 0x1245;
+    static final int PRCCNVRM = 0x1245;
 
     // Query not open codepoint constant.
     static final int QRYNOPRM = 0x2202;
@@ -562,19 +487,19 @@ public class CodePoint {
     static final int RDBUPDRM = 0x2218;
 
     // Data Stream Syntax Error
-    public static final int SYNTAXRM = 0x124C;
+    static final int SYNTAXRM = 0x124C;
 
     // Parameter Value Not Supported codepoint constant.
-    public static final int VALNSPRM = 0x1252;
+    static final int VALNSPRM = 0x1252;
 
     // SQL Error Condition codepoint constant.
     static final int SQLERRRM = 0x2213;
 
     // Open Query Complete.
-    public final static int OPNQRYRM = 0x2205;
+    final static int OPNQRYRM = 0x2205;
 
     // End of Query.
-    public final static int ENDQRYRM = 0x220B;
+    final static int ENDQRYRM = 0x220B;
 
     // Data Descriptor Mismatch.
     final static int DTAMCHRM = 0x220E;
@@ -583,19 +508,15 @@ public class CodePoint {
     final static int OPNQFLRM = 0x2212;
 
     // RDB Result Set Reply Message.
-    public final static int RSLSETRM = 0x2219;
-
-    // Manager Level Overrides
-    public static final int MGRLVLOVR = 0x1C03;
+    final static int RSLSETRM = 0x2219;
 
     //----------------------------fdoca code points-------------------------------
 
     static final int RTNEXTDTA = 0x2148;
-    static final int RTNEXTROW = 0x01;
     static final int RTNEXTALL = 0x02;
 
     // Externalized FD:OCA Data codepoint constant.
-    public static final int EXTDTA = 0x146C;
+    static final int EXTDTA = 0x146C;
 
     // FDOCA data descriptor
     static final int FDODSC = 0x0010;
@@ -627,9 +548,6 @@ public class CodePoint {
     // Syntax Error Code.  DSS header f-bytes either not recognized or not supported.
     static int SYNERRCD_FBYTE_NOT_SUPPORTED = 0x04;
 
-    // Syntax Error Code.  Object length less than four.
-    static int SYNERRCD_OBJ_LEN_LESS_THAN_4 = 0x07;
-
     // Syntax Error Code.  Object length not allowed.
     static int SYNERRCD_OBJ_LEN_NOT_ALLOWED = 0x0B;
 
@@ -654,9 +572,6 @@ public class CodePoint {
     // Syntax Error Code.  DSS chaining bit not b'1', but error continuation requested.
     static int SYNERRCD_CHAIN_OFF_ERROR_CONTINUE = 0x1A;
 
-    // Conversational Protocol Error Code.  OBJDSS sent when not allowed.
-    static int PRCCNVCD_OBJDSS_SENT_NOT_ALLOWED = 0x03;
-
     // Information Only Severity Code.
     static int SVRCOD_INFO = 0;
 
@@ -682,67 +597,46 @@ public class CodePoint {
     //--------------------------XA code points---------------------------
 
     // SYNC Point Control Reply
-    public static final int SYNCCRD = 0x1248;
+    static final int SYNCCRD = 0x1248;
 
     // XA Return Value
-    public static final int XARETVAL = 0x1904;
+    static final int XARETVAL = 0x1904;
 
     // XA Timeout Value;
-    public static final int TIMEOUT = 0x1907;
+    static final int TIMEOUT = 0x1907;
 
     // new unit of work for XA
-    public static final int SYNCTYPE_NEW_UOW = 0x09;
+    static final int SYNCTYPE_NEW_UOW = 0x09;
 
     // End unit of work (Sync type).
-    public static final int SYNCTYPE_END_UOW = 0x0B;
+    static final int SYNCTYPE_END_UOW = 0x0B;
 
     // Prepare to commit (Sync type).
-    public static final int SYNCTYPE_PREPARE = 0x01;
-
-    // migrate to resync server sync type
-    public static final int SYNCTYPE_MIGRATE = 0x02;
+    static final int SYNCTYPE_PREPARE = 0x01;
 
     // commit sync type
-    public static final int SYNCTYPE_COMMITTED = 0x03;
+    static final int SYNCTYPE_COMMITTED = 0x03;
 
     // request to forget sync type
-    public static final int SYNCTYPE_REQ_FORGET = 0x06;
+    static final int SYNCTYPE_REQ_FORGET = 0x06;
 
     //rollback sync type
-    public static final int SYNCTYPE_ROLLBACK = 0x04;
-
-
-    // migrated unit of work sync type
-    public static final int SYNCTYPE_MIGRATED = 0x0A;
+    static final int SYNCTYPE_ROLLBACK = 0x04;
 
     //recover sync type
-    public static final int SYNCTYPE_INDOUBT = 0x0C;
-
-    // Length Codepoint
-    public static final int LLCP = 0x0004;
+    static final int SYNCTYPE_INDOUBT = 0x0C;
 
     // SYNC Type Codepoint
-    public static final int SYNCTYPE = 0x1187;
+    static final int SYNCTYPE = 0x1187;
 
     // XId Codepoint
-    public static final int XID = 0x1801;
+    static final int XID = 0x1801;
 
     // XA Flag Codepoint
-    public static final int XAFLAGS = 0x1903;
-
-
-    // Resync Types
-    public static final int RSYNC_FORGET = 0x02;
-
-    // UOW States
-    public static final int RESET_STATE = 0x01;
-    public static final int UNKNOWN_STATE = 0x3;
-    public static final int INDOUBT_STATE = 0x04;
-    public static final int COLD_STATE = 0x05;
+    static final int XAFLAGS = 0x1903;
 
     // XA Flags
-    public static final int TMNOFLAGS = 0x00000000;
-    public static final int TMLOCAL = 0x10000000;
+    static final int TMLOCAL = 0x10000000;
 
     // Prepared and hueristic complete list
     static final int PRPHRCLST = 0x1905;

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionReply.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionReply.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionReply.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionReply.java Fri May  3 03:42:14 2013
@@ -26,7 +26,7 @@ import org.apache.derby.client.am.Connec
 import org.apache.derby.client.am.SqlException;
 
 
-public class ConnectionReply {
+class ConnectionReply {
     private ConnectionReplyInterface materialConnectionReply_;
     Agent agent_;
 
@@ -38,32 +38,38 @@ public class ConnectionReply {
         materialConnectionReply_ = materialConnectionReply;
     }
 
-    public void readCommitSubstitute(ConnectionCallbackInterface connection) throws SqlException {
+    void readCommitSubstitute(ConnectionCallbackInterface connection)
+            throws SqlException {
         materialConnectionReply_.readCommitSubstitute(connection);
         agent_.checkForChainBreakingException_();
     }
 
-    public void readLocalCommit(ConnectionCallbackInterface connection) throws SqlException {
+    void readLocalCommit(ConnectionCallbackInterface connection)
+            throws SqlException {
         materialConnectionReply_.readLocalCommit(connection);
         agent_.checkForChainBreakingException_();
     }
 
-    public void readLocalRollback(ConnectionCallbackInterface connection) throws SqlException {
+    void readLocalRollback(ConnectionCallbackInterface connection)
+            throws SqlException {
         materialConnectionReply_.readLocalRollback(connection);
         agent_.checkForChainBreakingException_();
     }
 
-    public void readLocalXAStart(ConnectionCallbackInterface connection) throws SqlException {
+    void readLocalXAStart(ConnectionCallbackInterface connection)
+            throws SqlException {
         materialConnectionReply_.readLocalXAStart(connection);
         agent_.checkForChainBreakingException_();
     }
 
-    public void readLocalXACommit(ConnectionCallbackInterface connection) throws SqlException {
+    void readLocalXACommit(ConnectionCallbackInterface connection)
+            throws SqlException {
         materialConnectionReply_.readLocalXACommit(connection);
         agent_.checkForChainBreakingException_();
     }
 
-    public void readLocalXARollback(ConnectionCallbackInterface connection) throws SqlException {
+    void readLocalXARollback(ConnectionCallbackInterface connection)
+            throws SqlException {
         materialConnectionReply_.readLocalXARollback(connection);
         agent_.checkForChainBreakingException_();
     }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionReplyInterface.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionReplyInterface.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionReplyInterface.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionReplyInterface.java Fri May  3 03:42:14 2013
@@ -24,7 +24,7 @@ package org.apache.derby.client.net;
 import org.apache.derby.client.am.ConnectionCallbackInterface;
 import org.apache.derby.client.am.DisconnectException;
 
-public interface ConnectionReplyInterface {
+interface ConnectionReplyInterface {
     public void readCommitSubstitute(ConnectionCallbackInterface connection) throws DisconnectException;
 
     public void readLocalCommit(ConnectionCallbackInterface connection) throws DisconnectException;

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionRequestInterface.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionRequestInterface.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionRequestInterface.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionRequestInterface.java Fri May  3 03:42:14 2013
@@ -29,7 +29,7 @@ import org.apache.derby.client.am.SqlExc
 // Implementations of this interface should not dereference common layer Connection state, as it is passed in,
 // but may dereference material layer Connection state if necessary for performance.
 
-public interface ConnectionRequestInterface {
+interface ConnectionRequestInterface {
     public void writeCommitSubstitute(NetConnection connection)
             throws SqlException;
 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/DssConstants.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/DssConstants.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/DssConstants.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/DssConstants.java Fri May  3 03:42:14 2013
@@ -26,9 +26,6 @@ import org.apache.derby.iapi.reference.D
 class DssConstants {
     static final int MAX_DSS_LEN = DRDAConstants.DATA_STREAM_STRUCTURE_MAX_LENGTH;
 
-    // Registered SNA GDS identifier indicating DDM data (xD0 for DDM data).
-    static final int GDS_ID = 0xD0;
-
     // GDS chaining bits.
     static final int GDSCHAIN = 0x40;
 
@@ -41,9 +38,6 @@ class DssConstants {
     // GDS formatter for an OBJDSS.
     static final int GDSFMT_OBJDSS = 0x03;
 
-    // GDS formatter for an RPYDSS.
-    static final int GDSFMT_RPYDSS = 0x02;
-
     // GDS formatter for an RQSDSS.
     static final int GDSFMT_RQSDSS = 0x01;
 
@@ -51,19 +45,6 @@ class DssConstants {
     // GDS formatter for an RQSDSS without a reply.
     static final int GDSFMT_RQSDSS_NOREPLY = 0x05;
 
-    static final byte RQST_CHN_DIFFCOR_CONT = (byte) 0x61;
-    static final byte RQST_CHN_DIFFCOR_NOCONT = (byte) 0x41;
-    static final byte RQST_CHN_SAMECOR_CONT = (byte) 0x71;
-    static final byte RQST_CHN_SAMECOR_NOCONT = (byte) 0x51;
-    static final byte RQST_NOCHN_CONT = (byte) 0x21;
-    static final byte RQST_NOCHN_NOCONT = (byte) 0x01;
-
-    static final byte RPY_CHN_DIFFCOR_CONT = (byte) 0x62;
-    static final byte RPY_CHN_DIFFCOR_NOCONT = (byte) 0x42;
-    static final byte RPY_CHN_SAMECOR_CONT = (byte) 0x72;
-    static final byte RPY_CHN_SAMECOR_NOCONT = (byte) 0x52;
-    static final byte RPY_NOCHN_CONT = (byte) 0x22;
-    static final byte RPY_NOCHN_NOCONT = (byte) 0x02;
 
     // hide the default constructor
     private DssConstants() {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java Fri May  3 03:42:14 2013
@@ -33,7 +33,7 @@ import org.apache.derby.shared.common.re
  * DDM Parameters.  This implementation only supports converting from the ASCII invariant of UNICODE to Ebcdic.  This
  * should be fine since this class is intended for converting DDM Parameter data only.
  */
-public class EbcdicCcsidManager extends CcsidManager {
+class EbcdicCcsidManager extends CcsidManager {
 
     private static final int[] conversionArrayToEbcdic = {
         0x0000, 0x0001, 0x0002, 0x0003, 0x0037, 0x002d, 0x002e, 0x002f

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/FdocaConstants.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/FdocaConstants.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/FdocaConstants.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/FdocaConstants.java Fri May  3 03:42:14 2013
@@ -41,14 +41,9 @@ class FdocaConstants {
     static final int FDOCA_TYPE_NPSCLCHAR = 0x99;
     static final int FDOCA_TYPE_INTEGER_BE = 0x23;
     static final int FDOCA_TYPE_NINTEGER_BE = 0xA3;
-    static final int FDOCA_TYPE_INTEGER_LE = 0x24;
-    static final int FDOCA_TYPE_NINTEGER_LE = 0xA4;
     static final int FDOCA_TYPE_DECIMAL = 0x30;
     static final int FDOCA_TYPE_NDECIMAL = 0xB0;
     static final int FDOCA_TYPE_NUMERIC_CHAR = 0x32;
-    static final int FDOCA_TYPE_NNUMERIC_CHAR = 0xB2;
-    static final int FDOCA_TYPE_FLOAT_X86 = 0x47;
-    static final int FDOCA_TYPE_NFLOAT_X86 = 0xC7;
     static final int FDOCA_TYPE_FLOAT_IEEE = 0x48;
     static final int FDOCA_TYPE_NFLOAT_IEEE = 0xC8;
     static final int FDOCA_TYPE_LOBBYTES = 0x50;
@@ -56,10 +51,6 @@ class FdocaConstants {
     static final int FDOCA_TYPE_LOBCHAR = 0x51;
     static final int FDOCA_TYPE_NLOBCHAR = 0xD1;
 
-    // --- Override LIDs 0x50 - 0xAF
-    static final int FIRST_OVERRIDE_LID = 0x50;
-    static final int LAST_OVERRIDE_LID = 0xAF;
-
     static final int CPT_TRIPLET_TYPE = 0x7F;      // CPT triplet type
     static final int MDD_TRIPLET_TYPE = 0x78;      // MDD triplet type
     static final int NGDA_TRIPLET_TYPE = 0x76;     // N-GDA triplet type
@@ -80,27 +71,6 @@ class FdocaConstants {
     static final int SQLDTARD_RLO_SIZE = 6;        // size of SQLDTARD minus MDD
     static final int SQLCADTA_RLO_SIZE = 9;        // size of SQLCDTA minus MDD
     static final int SDA_TRIPLET_SIZE = 12;        // Size of SDA triplet
-    static final int SQLDTAGRP_SIZE = 3;           // Size of SQLDTAGRP descriptor
-    static final int CPT_SIZE = 3;                 // Size of CPT descriptor
-    static final int SQLDTAGRP_COL_DSC_SIZE = 3;   // Env. LID & len. bytes
-    static final int MDD_REST_SIZE = 5;            // Size of the MDD group minus length and type
-
-    static final int MDD_SDA_TRIPLET_SIZE = 19;
-    static final int MDD_SDA_PROTOCOLTYPE_OFFSET = 6;
-    static final int MDD_SDA_FDOCALID_OFFSET = 9;
-    static final int MDD_SDA_FDOCATYPE_OFFSET = 10;
-    static final int MDD_SDA_CCSID_OFFSET = 11;
-    static final int MDD_SDA_LENGTH_OFFSET = 17;
-
-    static final byte[] defaultMddSdaBytes = {
-        (byte) 0x07, (byte) 0x78, (byte) 0x00, (byte) 0x05,
-        (byte) 0x01, (byte) 0x01, (byte) 0x00, // protocol type
-        (byte) 0x0C, (byte) 0x70, (byte) 0x00, // fdoca triplet lid
-        (byte) 0x00, // fdoca field type
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // ccsid
-        (byte) 0x01, (byte) 0x01,
-        (byte) 0x7F, (byte) 0xFF                           // length
-    };
 
     static final byte[] MDD_SQLDTAGRP_TOSEND = {
         (byte) 0x07, (byte) 0x78, (byte) 0x00, (byte) 0x05,

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/FdocaSimpleDataArray.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/FdocaSimpleDataArray.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/FdocaSimpleDataArray.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/FdocaSimpleDataArray.java Fri May  3 03:42:14 2013
@@ -30,15 +30,6 @@ class FdocaSimpleDataArray {
     // which protocol type the mdd override is for.
     int protocolType_;
 
-    // the FD:OCA field type indicator shows exactly how the data is represented
-    // in the environment.  see the FD:OCA reference for a detailed explanation of
-    // these types.
-    int fdocaFieldType_;
-
-    // this is the representation used by the DNC converters.  this is like the
-    // FD:OCA field type but the dnc converters don't use FD:OCA types as input.
-    int representation_;
-
     // the ccsid identifies the encoding of the character data.  converting the
     // ccsid into binary form generates the four byte representation.  The
     // FD:OCA rules state that if the high order 16 bits of the CCSID field
@@ -50,68 +41,28 @@ class FdocaSimpleDataArray {
     // it must be 0 for all other types.
     int characterSize_;
 
-    // this is used to specify mode of interpretation of FD:OCA
-    // architecture for all variable length data types (including null
-    // terminated), that as the SBCS variable character type.  The
-    // low order bit of this byte is used to control interpretation
-    // of Length Fields in SDAs for variable length types.  A '0' in that
-    // bit indicates that non-zero length field values indicate the space
-    // reserved for data and that all the space is transmitted
-    // whether or not it contains valid data.  In the case of variable
-    // length types, the first two bytes of the data itself determine
-    // the valid data length.  A '1' in this bit shows that non-zero length
-    // field values indicate the maximum value of the length fields
-    // that the data will contain.  Only enough space to contain each
-    // data value is transmitted for each value.
-    int mode_;
-
-    // this represents the maximum valid value.  when and if a group
-    // data array (GDA) triplet overrides it, the value can be reduced.
-    // For character fields with only DBCS characters, this is the length in
-    // characters (bytes/2).  For all other cases, the length is in bytes.
-    // It does not include the length of the length field (variable length
-    // types) or null indicator (nullable types).
-    //
-    int fieldLength_;
-
     // this is a group of types which indicates how the data length are computed.
     int typeToUseForComputingDataLength_;
 
     //---------------------constructors/finalizer---------------------------------
 
     FdocaSimpleDataArray(int protocolType,
-                         int fdocaFieldType,
-                         int representation,
                          int ccsid,
                          int characterSize,
-                         int mode,
-                         int fieldLength,
                          int typeToUseForComputingDataLength) {
         protocolType_ = protocolType;
-        fdocaFieldType_ = fdocaFieldType;
-        representation_ = representation;
         ccsid_ = ccsid;
         characterSize_ = characterSize;
-        mode_ = mode;
-        fieldLength_ = fieldLength;
         typeToUseForComputingDataLength_ = typeToUseForComputingDataLength;
     }
 
     public void update(int protocolType,
-                       int fdocaFieldType,
-                       int representation,
                        int ccsid,
                        int characterSize,
-                       int mode,
-                       int fieldLength,
                        int typeToUseForComputingDataLength) {
         protocolType_ = protocolType;
-        fdocaFieldType_ = fdocaFieldType;
-        representation_ = representation;
         ccsid_ = ccsid;
         characterSize_ = characterSize;
-        mode_ = mode;
-        fieldLength_ = fieldLength;
         typeToUseForComputingDataLength_ = typeToUseForComputingDataLength;
     }
 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NaiveTrustManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NaiveTrustManager.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NaiveTrustManager.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NaiveTrustManager.java Fri May  3 03:42:14 2013
@@ -42,7 +42,7 @@ import java.security.cert.CertificateExc
  * This is a naive trust manager we use when we don't want server
  * authentication. Any certificate will be accepted. 
  **/
-public class NaiveTrustManager
+class NaiveTrustManager
     implements X509TrustManager
 {
 
@@ -60,7 +60,7 @@ public class NaiveTrustManager
      * Utility routine which is not part of the X509TrustManager
      * interface.
      **/
-    public static SocketFactory getSocketFactory()
+    static SocketFactory getSocketFactory()
         throws NoSuchAlgorithmException,
                KeyManagementException,
                NoSuchProviderException,

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java Fri May  3 03:42:14 2013
@@ -40,23 +40,20 @@ import org.apache.derby.client.am.Utils;
 import org.apache.derby.shared.common.sanity.SanityManager;
 
 import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.shared.common.reference.MessageId;
-import org.apache.derby.shared.common.i18n.MessageUtil;
 
 public class NetAgent extends Agent {
     //---------------------navigational members-----------------------------------
 
     // All these request objects point to the same physical request object.
-    public ConnectionRequestInterface connectionRequest_;
-    public NetConnectionRequest packageRequest_;
-    public StatementRequestInterface statementRequest_;
-    public ResultSetRequestInterface resultSetRequest_;
+    ConnectionRequestInterface connectionRequest_;
+    StatementRequestInterface statementRequest_;
+    ResultSetRequestInterface resultSetRequest_;
 
     // All these reply objects point to the same physical reply object.
-    public ConnectionReply connectionReply_;
-    public ConnectionReply packageReply_;
-    public StatementReply statementReply_;
-    public ResultSetReply resultSetReply_;
+    ConnectionReply connectionReply_;
+    private ConnectionReply packageReply_;
+    StatementReply statementReply_;
+    ResultSetReply resultSetReply_;
 
     //---------------------navigational cheat-links-------------------------------
     // Cheat-links are for convenience only, and are not part of the conceptual model.
@@ -69,29 +66,29 @@ public class NetAgent extends Agent {
 
     // Alias for (Request) super.*Request, all in one
     // In the case of the NET implementation, these all point to the same physical request object.
-    protected Request request_;
-    public NetConnectionRequest netConnectionRequest_;
-    public NetPackageRequest netPackageRequest_;
-    public NetStatementRequest netStatementRequest_;
-    public NetResultSetRequest netResultSetRequest_;
+    private Request request_;
+    NetConnectionRequest netConnectionRequest_;
+    private NetPackageRequest netPackageRequest_;
+    private NetStatementRequest netStatementRequest_;
+    private NetResultSetRequest netResultSetRequest_;
 
     // Alias for (Reply) super.*Reply, all in one.
     // In the case of the NET implementation, these all point to the same physical reply object.
-    protected Reply reply_;
-    public NetConnectionReply netConnectionReply_;
-    public NetPackageReply netPackageReply_;
-    public NetStatementReply netStatementReply_;
-    public NetResultSetReply netResultSetReply_;
+    private Reply reply_;
+    NetConnectionReply netConnectionReply_;
+    private NetPackageReply netPackageReply_;
+    private NetStatementReply netStatementReply_;
+    private NetResultSetReply netResultSetReply_;
 
     //-----------------------------state------------------------------------------
 
     Socket socket_;
-    InputStream rawSocketInputStream_;
-    OutputStream rawSocketOutputStream_;
+    private InputStream rawSocketInputStream_;
+    private OutputStream rawSocketOutputStream_;
 
     String server_;
     int port_;
-    int clientSSLMode_;
+    private int clientSSLMode_;
 
     private EbcdicCcsidManager ebcdicCcsidManager_;
     private Utf8CcsidManager utf8CcsidManager_;
@@ -99,19 +96,21 @@ public class NetAgent extends Agent {
     
     // TODO: Remove target? Keep just one CcsidManager?
     //public CcsidManager targetCcsidManager_;
-    public Typdef typdef_;
-    public Typdef targetTypdef_;
-    public Typdef originalTargetTypdef_; // added to support typdef overrides
+    Typdef typdef_;
+    Typdef targetTypdef_;
+    Typdef originalTargetTypdef_; // added to support typdef overrides
 
-    protected int svrcod_;
+    private int svrcod_;
 
-    public int orignalTargetSqlam_ = NetConfiguration.MGRLVL_7;
-    public int targetSqlam_ = orignalTargetSqlam_;
+    int orignalTargetSqlam_ = NetConfiguration.MGRLVL_7;
+    int targetSqlam_ = orignalTargetSqlam_;
 
-    public SqlException exceptionOpeningSocket_ = null;
-    public SqlException exceptionConvertingRdbnam = null;
+    SqlException exceptionOpeningSocket_ = null;
+    SqlException exceptionConvertingRdbnam = null;
     
     //---------------------constructors/finalizer---------------------------------
+
+    // Only used for testing
     public NetAgent(NetConnection netConnection,
                     LogWriter logWriter) throws SqlException {
         super(netConnection, logWriter);
@@ -209,7 +208,6 @@ public class NetAgent extends Agent {
 
             resultSetRequest_ = (ResultSetRequestInterface) netResultSetRequest_;
             statementRequest_ = (StatementRequestInterface) netStatementRequest_;
-            packageRequest_ = (NetConnectionRequest) netPackageRequest_;
             connectionRequest_ = (ConnectionRequestInterface) netConnectionRequest_;
         } else {
             netResultSetReply_ = new NetResultSetReply(this, netConnection_.commBufferSize_);
@@ -233,7 +231,6 @@ public class NetAgent extends Agent {
 
             resultSetRequest_ = (ResultSetRequestInterface) netResultSetRequest_;
             statementRequest_ = (StatementRequestInterface) netStatementRequest_;
-            packageRequest_ = (NetConnectionRequest) netPackageRequest_;
             connectionRequest_ = (ConnectionRequestInterface) netConnectionRequest_;
         }
     }
@@ -275,7 +272,7 @@ public class NetAgent extends Agent {
         svrcod_ = CodePoint.SVRCOD_INFO;
     }
 
-    int getSvrcod() {
+    private int getSvrcod() {
         return svrcod_;
     }
 
@@ -398,7 +395,7 @@ public class NetAgent extends Agent {
         return timeout;
     }
 
-    protected void sendRequest() throws DisconnectException {
+    private void sendRequest() throws DisconnectException {
         try {
             request_.flush(rawSocketOutputStream_);
         } catch (IOException e) {
@@ -426,7 +423,7 @@ public class NetAgent extends Agent {
         rawSocketOutputStream_ = outputStream;
     }
 
-    public void throwCommunicationsFailure(Throwable cause) 
+    void throwCommunicationsFailure(Throwable cause)
         throws DisconnectException {
         //DisconnectException
         //accumulateReadExceptionAndDisconnect
@@ -521,7 +518,7 @@ public class NetAgent extends Agent {
     /**
      * Switches the current CCSID manager to UTF-8
      */
-    public void switchToUtf8CcsidMgr() {
+    void switchToUtf8CcsidMgr() {
         currentCcsidManager_ = utf8CcsidManager_;
     }
     
@@ -532,19 +529,6 @@ public class NetAgent extends Agent {
         currentCcsidManager_ = ebcdicCcsidManager_;
     }
 
-    public String convertToStringTcpIpAddress(int tcpIpAddress) {
-        StringBuffer ipAddrBytes = new StringBuffer();
-        ipAddrBytes.append((tcpIpAddress >> 24) & 0xff);
-        ipAddrBytes.append(".");
-        ipAddrBytes.append((tcpIpAddress >> 16) & 0xff);
-        ipAddrBytes.append(".");
-        ipAddrBytes.append((tcpIpAddress >> 8) & 0xff);
-        ipAddrBytes.append(".");
-        ipAddrBytes.append((tcpIpAddress) & 0xff);
-
-        return ipAddrBytes.toString();
-    }
-
     protected int getPort() {
         return port_;
     }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCallableStatement.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCallableStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCallableStatement.java Fri May  3 03:42:14 2013
@@ -21,15 +21,12 @@
 package org.apache.derby.client.net;
 
 import org.apache.derby.client.am.ClientCallableStatement;
-import org.apache.derby.client.am.ColumnMetaData;
 import org.apache.derby.client.am.MaterialPreparedStatement;
-import org.apache.derby.client.am.Section;
 import org.apache.derby.client.am.SqlException;
 import org.apache.derby.jdbc.ClientDriver;
-import org.apache.derby.client.am.ClientJDBCObjectFactory;
 import org.apache.derby.client.ClientPooledConnection;
 
-public class NetCallableStatement extends NetPreparedStatement
+class NetCallableStatement extends NetPreparedStatement
         implements MaterialPreparedStatement {
 
     ClientCallableStatement callableStatement_;
@@ -43,7 +40,7 @@ public class NetCallableStatement extend
     }
 
     // Relay constructor for all NetCallableStatement, constructors
-    NetCallableStatement(ClientCallableStatement statement,
+    private NetCallableStatement(ClientCallableStatement statement,
                          NetAgent netAgent,
                          NetConnection netConnection) throws SqlException {
         super(statement, netAgent, netConnection);
@@ -51,7 +48,7 @@ public class NetCallableStatement extend
         initNetCallableStatement(statement);
     }
 
-    void resetNetCallableStatement(ClientCallableStatement statement,
+    private void resetNetCallableStatement(ClientCallableStatement statement,
                                    NetAgent netAgent,
                                    NetConnection netConnection) throws SqlException {
         super.resetNetPreparedStatement(statement, netAgent, netConnection);

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java Fri May  3 03:42:14 2013
@@ -26,20 +26,8 @@ import org.apache.derby.client.am.Versio
 public class NetConfiguration {
     // ---------------------------------------------------------------------------
 
-    static final int INITIAL_CAPACITY = 10; // initial size of the Vector for the input parameters
-
     // Value to use when padding non-character data in ddm objects.
-    public static final byte NON_CHAR_DDM_DATA_PAD_BYTE = 0x00;
-
-    static final int CURSOR_NOT_OPEN = 0;
-    static final int CURSOR_OPEN = 1;
-    static final int CURSOR_CLOSE_ONLY = 2;
-
-    // Number of bytes in the DDM header.
-    static final int DDMHDR_LENGTH = 4;
-
-    // Number of bytes in the DSS header.
-    static final int DSSHDR_LENGTH = 6;
+    static final byte NON_CHAR_DDM_DATA_PAD_BYTE = 0x00;
 
     // Maximum size of External Name.
     static final int EXTNAM_MAXSIZE = 255;
@@ -78,14 +66,11 @@ public class NetConfiguration {
     static final int PASSWORD_MAXSIZE = 255;
 
     // Fixed PRDDTA application id fixed length.
-    public static final int PRDDTA_APPL_ID_FIXED_LEN = 20;
+    static final int PRDDTA_APPL_ID_FIXED_LEN = 20;
 
     // PRDDTA Accounting Suffix Length byte offset.
     static final int PRDDTA_ACCT_SUFFIX_LEN_BYTE = 55;
 
-    // PRDDTA Max Accounting Suffix Length.
-    static final int PRDDTA_MAX_ACCT_SUFFIX_LEN = 199;
-
     // PRDDTA Length byte offset.
     static final int PRDDTA_LEN_BYTE = 0;
 
@@ -93,19 +78,19 @@ public class NetConfiguration {
     static final int PRDDTA_MAXSIZE = 255;
 
     // PRDDTA platform id.
-    public static final String PRDDTA_PLATFORM_ID = "JVM               ";
+    static final String PRDDTA_PLATFORM_ID = "JVM               ";
 
     // Fixed PRDDTA user id fixed length.
-    public static final int PRDDTA_USER_ID_FIXED_LEN = 8;
+    static final int PRDDTA_USER_ID_FIXED_LEN = 8;
 
     // Identifier Length for fixed length rdb name
-    public static final int PKG_IDENTIFIER_FIXED_LEN = 18;
+    static final int PKG_IDENTIFIER_FIXED_LEN = 18;
 
     // Maximum RDB Identifier Length
     static final int PKG_IDENTIFIER_MAX_LEN = 255;
 
     // Fixed pkgcnstkn length
-    public static final int PKGCNSTKN_FIXED_LEN = 8;
+    static final int PKGCNSTKN_FIXED_LEN = 8;
 
     // Maximum length of a security token.
     // Anything greater than 32763 bytes of SECTKN would require extended length DDMs.
@@ -122,28 +107,12 @@ public class NetConfiguration {
     // Manager is NA or not usued.
     static final int MGRLVL_NA = 0;
 
-    // Manager Level 3 constant.
-    static final int MGRLVL_3 = 0x03;
-
-    // Manager Level 4 constant.
-    static final int MGRLVL_4 = 0x04;
-
     // Manager Level 5 constant.
     static final int MGRLVL_5 = 0x05;
 
-    // Manager level 6 constant.
-    static final int MGRLVL_6 = 0x06;
-
     // Manager Level 7 constant.
     static final public int MGRLVL_7 = 0x07;
 
-    // Indicates the DCE security mechanism.
-    static final int SECMEC_DCESEC = 0x01;
-
-    // Indicates encrypted userid, password,
-    // new password security mechanism.
-    static final int SECMEC_EUSRIDNWPWD = 0x0A;
-
     // Indicates userid/encrypted password security mechanism.
     public static final int SECMEC_EUSRIDPWD = 0x09;
 
@@ -179,16 +148,13 @@ public class NetConfiguration {
 
 
     // IEEE ASCII constant.
-    public static final String SYSTEM_ASC = "QTDSQLASC";
-
-    // JVM constant.
-    static final String SYSTEM_JVM = "QTDSQLJVM";
+    static final String SYSTEM_ASC = "QTDSQLASC";
 
     // Maximum size of User Name.
     static final int USRID_MAXSIZE = 255;
 
     // Product id of the ClientDNC.
-    public static final String PRDID;
+    static final String PRDID;
 
     // The server release level of this product.
     // It will be prefixed with PRDID

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java Fri May  3 03:42:14 2013
@@ -59,7 +59,7 @@ import org.apache.derby.shared.common.sa
 public class NetConnection extends ClientConnection {
     
     // Use this to get internationalized strings...
-    protected static final MessageUtil msgutil = SqlException.getMessageUtil();
+    private static final MessageUtil msgutil = SqlException.getMessageUtil();
 
     protected NetAgent netAgent_;
     //contains a reference to the PooledConnection from which this created 
@@ -70,9 +70,6 @@ public class NetConnection extends Clien
     private final ClientPooledConnection pooledConnection_;
     private final boolean closeStatementsOnClose;
 
-    // For XA Transaction
-    protected int pendingEndXACallinfoOffset_ = -1;
-
     //-----------------------------state------------------------------------------
 
     // these variables store the manager levels for the connection.
@@ -92,14 +89,14 @@ public class NetConnection extends Clien
     protected int targetAgent_ = NetConfiguration.MGRLVL_7;  //01292003jev monitoring
     protected int targetCmntcpip_ = NetConfiguration.MGRLVL_5;
     protected int targetRdb_ = NetConfiguration.MGRLVL_7;
-    public int targetSecmgr_ = NetConfiguration.MGRLVL_7;
+    int targetSecmgr_ = NetConfiguration.MGRLVL_7;
     protected int targetCmnappc_ = NetConfiguration.MGRLVL_NA;  //NA since currently not used by net
     protected int targetXamgr_ = NetConfiguration.MGRLVL_7;
     protected int targetSyncptmgr_ = NetConfiguration.MGRLVL_NA;
     protected int targetRsyncmgr_ = NetConfiguration.MGRLVL_NA;
     protected int targetUnicodemgr_ = CcsidManager.UTF8_CCSID;
 
-    String extnam_;
+    private String extnam_;
 
     // Server Class Name of the target server returned in excsatrd.
     // Again this is something which the driver is not currently using
@@ -108,28 +105,22 @@ public class NetConnection extends Clien
     // the database meta data object will make use of this
     // for example, the product id (prdid) would give this driver an idea of
     // what type of sevrer it is connected to.
-    public String targetSrvclsnm_;
-
-    // Server Name of the target server returned in excsatrd.
-    // Again this is something which we don't currently use but
-    // keep it in case we want to log it in some problem determination
-    // trace/dump later.
-    protected String targetSrvnam_;
+    String targetSrvclsnm_;
 
     // Server Product Release Level of the target server returned in excsatrd.
     // specifies the procuct release level of a ddm server.
     // Again this is something which we don't currently use but
     // keep it in case we want to log it in some problem determination
     // trace/dump later.
-    public String targetSrvrlslv_;
+    String targetSrvrlslv_;
 
     // Keys used for encryption.
-    transient byte[] publicKey_;
+    private transient byte[] publicKey_;
     private transient byte[] targetPublicKey_;
 
     // Seeds used for strong password substitute generation (USRSSBPWD)
-    transient byte[] sourceSeed_;   // Client seed
-    transient byte[] targetSeed_;   // Server seed
+    private transient byte[] sourceSeed_;   // Client seed
+    private transient byte[] targetSeed_;   // Server seed
 
     // Product-Specific Data (prddta) sent to the server in the accrdb command.
     // The prddta has a specified format.  It is saved in case it is needed again
@@ -143,16 +134,16 @@ public class NetConnection extends Clien
 
     // Correlation Token of the source sent to the server in the accrdb.
     // It is saved like the prddta in case it is needed for a connect reflow.
-    public byte[] crrtkn_;
+    byte[] crrtkn_;
 
     // The Secmec used by the target.
     // It contains the negotiated security mechanism for the connection.
     // Initially the value of this is 0.  It is set only when the server and
     // the target successfully negotiate a security mechanism.
-    int targetSecmec_;
+    private int targetSecmec_;
 
     // the security mechanism requested by the application
-    protected int securityMechanism_;
+    private int securityMechanism_;
 
     // stored the password for deferred reset only.
     private transient char[] deferredResetPassword_ = null;
@@ -180,16 +171,15 @@ public class NetConnection extends Clien
     protected byte[] cnntkn_ = null;
 
     protected NetXAResource xares_ = null;
-    private HashMap<Xid, NetIndoubtTransaction> indoubtTransactions_ = null;
+    private List<Xid> indoubtTransactions_ = null;
     protected int currXACallInfoOffset_ = 0;
-    private short seqNo_ = 1;
 
     // Flag to indicate a read only transaction
     protected boolean readOnlyTransaction_ = true;
 
     //---------------------constructors/finalizer---------------------------------
 
-    public NetConnection(NetLogWriter netLogWriter,
+    NetConnection(NetLogWriter netLogWriter,
                          String databaseName,
                          Properties properties) throws SqlException {
         super(netLogWriter, 0, "", -1, databaseName, properties);
@@ -197,7 +187,7 @@ public class NetConnection extends Clien
         this.closeStatementsOnClose = true;
     }
 
-    public NetConnection(
+    NetConnection(
             NetLogWriter netLogWriter,
             ClientBaseDataSourceRoot dataSource,
             String user,
@@ -210,7 +200,7 @@ public class NetConnection extends Clien
     }
 
     // For jdbc 1 connections
-    public NetConnection(NetLogWriter netLogWriter,
+    NetConnection(NetLogWriter netLogWriter,
                          int driverManagerLoginTimeout,
                          String serverName,
                          int portNumber,
@@ -235,7 +225,7 @@ public class NetConnection extends Clien
     }
 
     // For JDBC 2 Connections
-    public NetConnection(NetLogWriter netLogWriter,
+    NetConnection(NetLogWriter netLogWriter,
                          String user,
                          String password,
                          ClientBaseDataSourceRoot dataSource,
@@ -248,7 +238,7 @@ public class NetConnection extends Clien
         initialize(password, dataSource, isXAConn);
     }
 
-    public NetConnection(NetLogWriter netLogWriter,
+    NetConnection(NetLogWriter netLogWriter,
                          String ipaddr,
                          int portNumber,
                          ClientBaseDataSourceRoot dataSource,
@@ -287,7 +277,7 @@ public class NetConnection extends Clien
      * @throws             SqlException
      */
     
-    public NetConnection(NetLogWriter netLogWriter,
+    NetConnection(NetLogWriter netLogWriter,
                          String user,
                          String password,
                          ClientBaseDataSourceRoot dataSource,
@@ -333,7 +323,7 @@ public class NetConnection extends Clien
 
     // preferably without password in the method signature.
     // We can probally get rid of flowReconnect method.
-    public void resetNetConnection(LogWriter logWriter)
+    private void resetNetConnection(LogWriter logWriter)
             throws SqlException {
         super.resetConnection(logWriter);
         //----------------------------------------------------
@@ -341,7 +331,6 @@ public class NetConnection extends Clien
         // change and can be used to check secmec support.
 
         targetSrvclsnm_ = null;
-        targetSrvnam_ = null;
         targetSrvrlslv_ = null;
         publicKey_ = null;
         targetPublicKey_ = null;
@@ -371,26 +360,12 @@ public class NetConnection extends Clien
         resetNetConnection(logWriter);
     }
 
-    List getSpecialRegisters() {
-        if (xares_ != null) {
-            return xares_.getSpecialRegisters();
-        } else {
-            return null;
-        }
-    }
-
-    public void addSpecialRegisters(String s) {
-        if (xares_ != null) {
-            xares_.addSpecialRegisters(s);
-        }
-    }
-
-    protected void completeReset(boolean isDeferredReset)
+    private void completeReset(boolean isDeferredReset)
             throws SqlException {
         super.completeReset(isDeferredReset, closeStatementsOnClose, xares_);
     }
 
-    public final void flowConnect(String password,
+    private void flowConnect(String password,
                             int securityMechanism) throws SqlException {
         netAgent_ = (NetAgent) super.agent_;
         constructExtnam();
@@ -474,7 +449,7 @@ public class NetConnection extends Clien
         }
     }
     
-    protected final void flowSimpleConnect() throws SqlException {
+    private void flowSimpleConnect() throws SqlException {
         netAgent_ = (NetAgent) super.agent_;
         constructExtnam();
         // these calls need to be after newing up the agent
@@ -537,7 +512,8 @@ public class NetConnection extends Clien
         }
     }
 
-    protected boolean flowReconnect(String password, int securityMechanism) throws SqlException {
+    private boolean flowReconnect(String password, int securityMechanism)
+            throws SqlException {
         constructExtnam();
         // these calls need to be after newing up the agent
         // because they require the ccsid manager
@@ -597,14 +573,10 @@ public class NetConnection extends Clien
         }
     }
 
-    protected byte[] getCnnToken() {
+    private byte[] getCnnToken() {
         return cnntkn_;
     }
 
-    protected short getSequenceNumber() {
-        return ++seqNo_;
-    }
-
     //--------------------------------flow methods--------------------------------
 
     private void flowUSRIDPWDconnect(String password) throws SqlException {
@@ -935,10 +907,9 @@ public class NetConnection extends Clien
     //-------------------parse callback methods--------------------------------
 
     void setServerAttributeData(String srvclsnm,
-                                String srvnam,
                                 String srvrlslv) {
         targetSrvclsnm_ = srvclsnm;      // since then can be optionally returned from the
-        targetSrvnam_ = srvnam;          // server
+                                         // server
         targetSrvrlslv_ = srvrlslv;
     }
 
@@ -1626,7 +1597,7 @@ public class NetConnection extends Clien
     }
 
     public void setIndoubtTransactions(
-            HashMap<Xid, NetIndoubtTransaction> indoubtTransactions) {
+            List<Xid> indoubtTransactions) {
 
         if (isXAConnection_) {
             if (indoubtTransactions_ != null) {
@@ -1636,13 +1607,9 @@ public class NetConnection extends Clien
         }
     }
 
-    public NetIndoubtTransaction getIndoubtTransaction(Xid xid) {
-        return indoubtTransactions_.get(xid);
-    }
-
-    public Xid[] getIndoubtTransactionIds() {
+    Xid[] getIndoubtTransactionIds() {
         Xid[] result = new Xid[0];
-        return indoubtTransactions_.keySet().toArray(result);
+        return indoubtTransactions_.toArray(result);
     }
 
     protected void setReadOnlyTransactionFlag(boolean flag) {
@@ -1650,10 +1617,8 @@ public class NetConnection extends Clien
     }
 
     public SectionManager newSectionManager
-            (String collection,
-             Agent agent,
-             String databaseName) {
-        return new SectionManager(collection, agent, databaseName);
+            (Agent agent) {
+        return new SectionManager(agent);
     }
 
     public boolean willAutoCommitGenerateFlow() {
@@ -1693,15 +1658,6 @@ public class NetConnection extends Clien
         return targetSrvclsnm_;
     }
 
-    public void doResetNow() throws SqlException {
-        if (!resetConnectionAtFirstSql_) {
-            return; // reset not needed
-        }
-        agent_.beginWriteChainOutsideUOW();
-        agent_.flowOutsideUOW();
-        agent_.endReadChain();
-    }
-    
     /**
      * @return Returns the connectionNull.
      */
@@ -1721,7 +1677,7 @@ public class NetConnection extends Clien
      *
      * @return true if QRYCLSIMP is fully supported
      */
-    public final boolean serverSupportsQryclsimp() {
+    final boolean serverSupportsQryclsimp() {
         NetDatabaseMetaData metadata =
             (NetDatabaseMetaData) databaseMetaData_;
         return metadata.serverSupportsQryclsimp();
@@ -1798,18 +1754,6 @@ public class NetConnection extends Clien
     }
     
     /**
-     * Check whether the server supports boolean values
-     * @return true if boolean values are supported
-     */
-    protected final boolean serverSupportsBooleanValues() {
-
-        NetDatabaseMetaData metadata =
-            (NetDatabaseMetaData) databaseMetaData_;
-
-        return metadata.serverSupportsBooleanValues();
-    }
-
-    /**
      * Returns if a transaction is in process
      * @return open
      */

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java?rev=1478635&r1=1478634&r2=1478635&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java Fri May  3 03:42:14 2013
@@ -54,34 +54,43 @@ public class  NetConnection40 extends Ne
      *-------------------------------------------------------
     */
 
-    public NetConnection40(NetLogWriter netLogWriter,
+    NetConnection40(NetLogWriter netLogWriter,
                          String databaseName,
                          Properties properties) throws SqlException {
-    super(netLogWriter,databaseName,properties);
+        super(netLogWriter,databaseName,properties);
     }
-    public NetConnection40(NetLogWriter netLogWriter,
+
+    NetConnection40(NetLogWriter netLogWriter,
                          ClientBaseDataSourceRoot dataSource,
                          String user,
                          String password) throws SqlException {
-    super(netLogWriter,dataSource,user,password);
+        super(netLogWriter,dataSource,user,password);
     }
-     public NetConnection40(NetLogWriter netLogWriter,
+
+    NetConnection40(NetLogWriter netLogWriter,
                          int driverManagerLoginTimeout,
                          String serverName,
                          int portNumber,
                          String databaseName,
                          Properties properties) throws SqlException{
-    super(netLogWriter,driverManagerLoginTimeout,serverName,portNumber,databaseName,properties);
-     }
-     public NetConnection40(NetLogWriter netLogWriter,
+        super(netLogWriter,
+                driverManagerLoginTimeout,
+                serverName,
+                portNumber,
+                databaseName,
+                properties);
+    }
+
+    NetConnection40(NetLogWriter netLogWriter,
                          String user,
                          String password,
                          ClientBaseDataSourceRoot dataSource,
                          int rmId,
                          boolean isXAConn) throws SqlException{
-    super(netLogWriter,user,password,dataSource,rmId,isXAConn);
+        super(netLogWriter,user,password,dataSource,rmId,isXAConn);
     }
-    public NetConnection40(NetLogWriter netLogWriter,
+
+    NetConnection40(NetLogWriter netLogWriter,
                          String ipaddr,
                          int portNumber,
                          ClientBaseDataSourceRoot dataSource,



Mime
View raw message