You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by kr...@apache.org on 2011/07/13 13:44:10 UTC
svn commit: r1145961 - in /db/derby/code/trunk/java:
client/org/apache/derby/client/am/ client/org/apache/derby/client/net/
client/org/apache/derby/jdbc/ drda/org/apache/derby/impl/drda/
engine/org/apache/derby/iapi/error/ engine/org/apache/derby/iapi/...
Author: kristwaa
Date: Wed Jul 13 11:44:09 2011
New Revision: 1145961
URL: http://svn.apache.org/viewvc?rev=1145961&view=rev
Log:
DERBY-5306: Remove dead methods (June 2011)
Removed a set of dead methods.
Patch file: derby-5306-1a-dead_methods.diff
Modified:
db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementRequest.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Like.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java Wed Jul 13 11:44:09 2011
@@ -167,15 +167,6 @@ public class CallableStatement extends P
registerOutParameterX(parameterIndex, jdbcType, scale);
}
- private int guessScaleForDecimalOrNumeric(int parameterIndex) {
- // Types.DECIMAL with no supplied scale will use the scale supplied by the setter method if input BigDecimal is not null
- if (parameterMetaData_.types_[parameterIndex - 1] == Types.DECIMAL &&
- parameters_[parameterIndex - 1] != null) {
- return parameterMetaData_.sqlScale_[parameterIndex - 1];
- }
- return 8; // default to scale of 8 if not specified
- }
-
public void registerOutParameter(int parameterIndex, int jdbcType, int scale) throws SQLException {
try
{
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java Wed Jul 13 11:44:09 2011
@@ -747,116 +747,12 @@ public class ColumnMetaData implements j
}
}
- // If the input parameter has been set, return true, else return false.
- private boolean isParameterModeGuessedAsAnInput(int parameterIndex) {
- if (sqlxParmmode_[parameterIndex - 1] == java.sql.ParameterMetaData.parameterModeIn ||
- sqlxParmmode_[parameterIndex - 1] == java.sql.ParameterMetaData.parameterModeInOut) {
- return true;
- }
- return false;
- }
-
// Does OUT parm registration rely on extended describe?
// If the output parameter has been registered, return true, else return false.
public boolean isParameterModeGuessedAsOutput(int parameterIndex) {
return sqlxParmmode_[parameterIndex - 1] >= java.sql.ParameterMetaData.parameterModeInOut;
}
- /** This method does not appear to be in use -- davidvc@apache.org
- // Only called when column meta data is not described. Called by setXXX methods.
- public void guessInputParameterMetaData(int parameterIndex,
- int jdbcType) throws SqlException {
- guessInputParameterMetaData(parameterIndex, jdbcType, 0);
- }
- */
-
- private void setParmModeForInputParameter(int parameterIndex) {
- if (sqlxParmmode_[parameterIndex - 1] == java.sql.ParameterMetaData.parameterModeOut) {
- sqlxParmmode_[parameterIndex - 1] = java.sql.ParameterMetaData.parameterModeInOut;
- } else if (sqlxParmmode_[parameterIndex - 1] == java.sql.ParameterMetaData.parameterModeUnknown) {
- sqlxParmmode_[parameterIndex - 1] = java.sql.ParameterMetaData.parameterModeIn;
- }
- }
-
-
- private void setParmModeForOutputParameter(int parameterIndex) {
- if (sqlxParmmode_[parameterIndex - 1] == java.sql.ParameterMetaData.parameterModeIn) {
- sqlxParmmode_[parameterIndex - 1] = java.sql.ParameterMetaData.parameterModeInOut;
- } else if (sqlxParmmode_[parameterIndex - 1] == java.sql.ParameterMetaData.parameterModeUnknown) {
- sqlxParmmode_[parameterIndex - 1] = java.sql.ParameterMetaData.parameterModeOut;
- }
- }
-
- private boolean isCompatibleDriverTypes(int registeredType, int guessedInputType) {
- switch (registeredType) {
- case Types.CHAR:
- case Types.VARCHAR:
- case Types.LONGVARCHAR:
- return guessedInputType == Types.CHAR || guessedInputType == Types.VARCHAR || guessedInputType == Types.LONGVARCHAR;
- case Types.BINARY:
- case Types.VARBINARY:
- case Types.LONGVARBINARY:
- return guessedInputType == Types.BINARY || guessedInputType == Types.VARBINARY || guessedInputType == Types.LONGVARBINARY;
- default:
- return registeredType == guessedInputType;
- }
- }
-
- // Only used when describe information is not available.
- private int getInternalTypeForGuessedOrRegisteredJdbcType(int guessedOrRegisteredJdbcType) throws SqlException {
- switch (guessedOrRegisteredJdbcType) {
- case java.sql.Types.BOOLEAN:
- return Types.BOOLEAN;
- case java.sql.Types.BIT:
- case java.sql.Types.TINYINT:
- case java.sql.Types.SMALLINT:
- return Types.SMALLINT;
- case java.sql.Types.INTEGER:
- return Types.INTEGER;
- case java.sql.Types.BIGINT:
- return Types.BIGINT;
- case java.sql.Types.REAL:
- return Types.REAL;
- case java.sql.Types.DOUBLE:
- case java.sql.Types.FLOAT:
- return Types.DOUBLE;
- case java.sql.Types.DECIMAL:
- case java.sql.Types.NUMERIC:
- return Types.DECIMAL;
- case java.sql.Types.DATE:
- return Types.DATE;
- case java.sql.Types.TIME:
- return Types.TIME;
- case java.sql.Types.TIMESTAMP:
- return Types.TIMESTAMP;
- case java.sql.Types.CHAR:
- return Types.CHAR;
- case java.sql.Types.VARCHAR:
- return Types.VARCHAR;
- case java.sql.Types.LONGVARCHAR:
- return Types.LONGVARCHAR;
- case java.sql.Types.BINARY:
- return Types.BINARY;
- case java.sql.Types.VARBINARY:
- return Types.VARBINARY;
- case java.sql.Types.LONGVARBINARY:
- return Types.LONGVARBINARY;
- case java.sql.Types.BLOB:
- return Types.BLOB;
- case java.sql.Types.CLOB:
- return Types.CLOB;
- case java.sql.Types.JAVA_OBJECT:
- return Types.JAVA_OBJECT;
- case java.sql.Types.NULL:
- case java.sql.Types.OTHER:
- throw new SqlException(logWriter_,
- new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
- default:
- throw new SqlException(logWriter_,
- new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
- }
- }
-
public void setLogWriter(LogWriter logWriter) {
logWriter_ = logWriter;
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java Wed Jul 13 11:44:09 2011
@@ -532,13 +532,6 @@ public abstract class ResultSet implemen
}
}
- // precondition: transaction state allows for auto commit to generate flow
- private void writeAutoCommitIfNotAutoCommitted() throws SqlException {
- if (connection_.autoCommit_ && !autoCommitted_) {
- connection_.writeAutoCommit();
- }
- }
-
private void readAutoCommitIfNotAutoCommitted() throws SqlException {
if (connection_.autoCommit_ && !autoCommitted_) {
connection_.readAutoCommit();
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=1145961&r1=1145960&r2=1145961&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 Wed Jul 13 11:44:09 2011
@@ -747,15 +747,6 @@ public class NetConnection extends org.a
agent_.endReadChain();
}
- private void flowServerAttributesAndSeedExchange(int securityMechanism,
- byte[] sourceSeed) throws SqlException {
- agent_.beginWriteChainOutsideUOW();
- writeServerAttributesAndSeedExchange(sourceSeed);
- agent_.flowOutsideUOW();
- readServerAttributesAndSeedExchange();
- agent_.endReadChain();
- }
-
private void flowSecurityCheckAndAccessRdb(int securityMechanism,
String user,
String password,
@@ -807,24 +798,11 @@ public class NetConnection extends org.a
publicKey);
}
- private void writeServerAttributesAndSeedExchange(byte[] sourceSeed)
- throws SqlException {
-
- // For now, we're just calling our cousin method to do the job
- writeServerAttributesAndKeyExchange(NetConfiguration.SECMEC_USRSSBPWD,
- sourceSeed);
- }
-
private void readServerAttributesAndKeyExchange(int securityMechanism) throws SqlException {
netAgent_.netConnectionReply_.readExchangeServerAttributes(this);
netAgent_.netConnectionReply_.readAccessSecurity(this, securityMechanism);
}
- private void readServerAttributesAndSeedExchange() throws SqlException {
- // For now, we're just calling our cousin method to do the job
- readServerAttributesAndKeyExchange(NetConfiguration.SECMEC_USRSSBPWD);
- }
-
private void writeSecurityCheckAndAccessRdb(int securityMechanism,
String user,
String password,
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java Wed Jul 13 11:44:09 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 {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java Wed Jul 13 11:44:09 2011
@@ -2409,39 +2409,6 @@ public class NetStatementReply extends N
return numColumns;
}
-
- private String parseSQLSTT() throws DisconnectException {
- parseLengthAndMatchCodePoint(CodePoint.SQLSTT);
- return parseSQLSTTGRP();
- }
-
- private String parseSQLSTTGRP() throws DisconnectException {
- int mixedNullInd = readUnsignedByte();
- int singleNullInd = 0;
- String sqlsttString = null;
- int stringLength = 0;
-
- if (mixedNullInd == CodePoint.NULLDATA) {
- singleNullInd = readUnsignedByte();
- if (singleNullInd == CodePoint.NULLDATA) {
- // throw DTAMCHRM
- doDtamchrmSemantics();
- }
- // read 4-byte length
- stringLength = readInt();
- // read sqlstt string
- sqlsttString = readString(stringLength, netAgent_.targetTypdef_.getCcsidSbcEncoding());
- } else {
- // read 4-byte length
- stringLength = readInt();
- // read sqlstt string
- sqlsttString = readString(stringLength, netAgent_.targetTypdef_.getCcsidMbcEncoding());
- // read null indicator
- singleNullInd = readUnsignedByte();
- }
- return sqlsttString;
- }
-
public void readSetSpecialRegister(StatementCallbackInterface statement) throws DisconnectException {
startSameIdChainParse();
parseEXCSQLSETreply(statement);
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementRequest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementRequest.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementRequest.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementRequest.java Wed Jul 13 11:44:09 2011
@@ -42,7 +42,6 @@ import org.apache.derby.shared.common.re
public class NetStatementRequest extends NetPackageRequest implements StatementRequestInterface {
java.util.ArrayList extdtaPositions_ = null; // Integers: build EXTDTA for column i
- int overrideLid_ = FdocaConstants.FIRST_OVERRIDE_LID;
// promototed parameters hold parameters that are promotoed to a different
// data type because they are too large to represent in PROTOCOL otherwise.
@@ -1836,10 +1835,6 @@ public class NetStatementRequest extends
}
}
- private int getNextOverrideLid() {
- return overrideLid_++;
- }
-
private void setFDODTALob(int securityMechanism,
Lob lob,
int[][] protocolTypesAndLengths,
Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java Wed Jul 13 11:44:09 2011
@@ -696,13 +696,6 @@ public abstract class ClientBaseDataSour
return defaultString;
}
- private static short parseShort(String shortString, short defaultShort) {
- if (shortString != null) {
- return Short.parseShort(shortString);
- }
- return defaultShort;
- }
-
private static int parseInt(String intString, int defaultInt) {
if (intString != null) {
return Integer.parseInt(intString);
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Wed Jul 13 11:44:09 2011
@@ -8922,20 +8922,6 @@ class DRDAConnThread extends Thread {
return 0; // SECMEC_USRSSBPWD is supported
}
- private static int peekStream(EXTDTAInputStream is) throws IOException{
-
- is.mark(1);
-
- try{
- return is.read();
-
- }finally{
- is.reset();
- }
-
- }
-
-
private static void closeStream(InputStream stream){
try{
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java Wed Jul 13 11:44:09 2011
@@ -210,18 +210,6 @@ class DRDAXAProtocol {
return new DRDAXid(formatId, gtrid, bqual);
}
-
- /**
- * parse XIDSHR
- *
- * @return XIDSHR value
- * @throws DRDAProtocolException
- */
- private int parseXIDSHR() throws DRDAProtocolException
- {
- return reader.readUnsignedByte();
- }
-
/**
* parse XAFlags
*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java Wed Jul 13 11:44:09 2011
@@ -108,14 +108,6 @@ public class StandardException extends E
/*
** End of constructors
- */
- /**
- * Sets the arguments for this exception.
- */
- private final void setArguments(Object[] arguments)
- {
- this.arguments = arguments;
- }
/**
* Returns the arguments for this exception,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java Wed Jul 13 11:44:09 2011
@@ -534,22 +534,6 @@ public class ClassHolder {
return addIndexReference(VMDescriptor.CONSTANT_String, valueIndex, 0);
}
- /**
- Add a string entry
- */
- private int addCodeUtf8(String value) {
- CONSTANT_Utf8_info sutf = addUtf8Entry(value);
- int index = sutf.setAsCode();
- if (index == 0) {
- // code string is already being used as string
- CONSTANT_Utf8_info eutf = addExtraUtf8(value);
- eutf.setAsCode(); // ensure the replace will happen
- index = eutf.getIndex();
- sutf.setAlternative(index);
- }
-
- return index;
- }
protected void cptPut(ClassFormatOutput out) throws IOException {
for (Enumeration e = cptEntries.elements(); e.hasMoreElements(); ) {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java Wed Jul 13 11:44:09 2011
@@ -390,14 +390,6 @@ public class RowUtil
return(ret_row);
}
-
- private static void newRowFromClassInfoTemplateError()
- {
- if (SanityManager.DEBUG)
- SanityManager.THROWASSERT(
- "unexpected error in newRowFromClassInfoTemplate()");
- }
-
/**
* Generate an "empty" row from an array of DataValueDescriptor objects.
* <p>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Like.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Like.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Like.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Like.java Wed Jul 13 11:44:09 2011
@@ -342,34 +342,6 @@ public class Like {
else return null; // still have strings to match, not done
}
- /**
- * matchSpecial
- *
- * check the pattern against the various special character arrays.
- * The array can be anyStringInts, anyCharInts or anyEscChars (always 1)
- */
-
- private static boolean matchSpecial(int[] pat, int patStart, int patEnd, int[] specialInts)
- {
- //
- // multi-collation units per char can exceed the pattern length
- // and we fall around the 2nd if statement and falsely return true.
- //
- if (specialInts.length > patEnd - patStart)
- return false;
- if (specialInts.length <= patEnd - patStart)
- {
- for (int index = 0; index < specialInts.length; index++)
- {
- if (pat[patStart + index] != specialInts[index])
- {
- return false; // more to match
- }
- }
- }
- return true;
- }
-
/*
Most typical interface for character string types with UCS_BASIC and
territory based collation.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java Wed Jul 13 11:44:09 2011
@@ -569,24 +569,6 @@ public final class SQLBoolean
}
- private void setValueCore(Number theValue)
- {
- if (SanityManager.DEBUG)
- SanityManager.ASSERT( ! immutable,
- "Attempt to set the value of an immutable SQLBoolean");
-
- if (theValue == null)
- {
- isnull = true;
- value = false;
- }
- else
- {
- value = (theValue.intValue() != 0);
- isnull = false;
- }
- }
-
/**
* @see DataValueDescriptor#setValue
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java?rev=1145961&r1=1145960&r2=1145961&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java Wed Jul 13 11:44:09 2011
@@ -3718,26 +3718,6 @@ public class EmbedDatabaseMetaData exten
}
/**
- * Gets the constant action factory
- *
- * @return the constant action factory.
- *
- * @exception StandardException Thrown on failur4e
- */
- private GenericConstantActionFactory getGenericConstantActionFactory()
- throws StandardException
- {
- if ( constantActionFactory == null )
- {
- GenericExecutionFactory execFactory = (GenericExecutionFactory)
- getLanguageConnectionContext().getLanguageConnectionFactory().getExecutionFactory();
- constantActionFactory = execFactory.getConstantActionFactory();
- }
-
- return constantActionFactory;
- }
-
- /**
* Gets the LanguageConnectionContext for this connection.
*
* @return the lcc for this connection