db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r985550 - in /db/derby/code/trunk/java: build/org/apache/derbyBuild/ client/org/apache/derby/client/am/ client/org/apache/derby/client/net/ engine/org/apache/derby/loc/ shared/org/apache/derby/shared/common/reference/ testing/org/apache/der...
Date Sat, 14 Aug 2010 18:00:37 GMT
Author: myrnavl
Date: Sat Aug 14 18:00:36 2010
New Revision: 985550

URL: http://svn.apache.org/viewvc?rev=985550&view=rev
Log:
DERBY-4767; Detailed prompt for Error XCL16 is different between Client and Embedded
  patch contributed by Yun Lee (yun dot lee dot bj at gmail dot com)

Modified:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/SectionManager.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
    db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java Sat Aug 14 18:00:36 2010
@@ -99,7 +99,7 @@ public class splitmessages {
         clientMessageIds.add(SQLState.LANG_INVALID_CALL_STATEMENT);
         clientMessageIds.add(SQLState.LOSS_OF_PRECISION_EXCEPTION);
         clientMessageIds.add(SQLState.LANG_INVALID_SQL_IN_BATCH);
-        clientMessageIds.add(SQLState.CLIENT_RESULT_SET_NOT_OPEN);
+        clientMessageIds.add(SQLState.LANG_RESULT_SET_NOT_OPEN);
         clientMessageIds.add(SQLState.CANT_CONVERT_UNICODE_TO_EBCDIC);
         clientMessageIds.add(SQLState.SECMECH_NOT_SUPPORTED);
         clientMessageIds.add(SQLState.DRDA_COMMAND_NOT_IMPLEMENTED);

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=985550&r1=985549&r2=985550&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 Sat Aug 14 18:00:36 2010
@@ -293,7 +293,7 @@ public abstract class ResultSet implemen
 
     // used by DBMD
     boolean nextX() throws SqlException {
-        checkForClosedResultSet();
+        checkForClosedResultSet("next");
         clearWarningsX();
 
         moveToCurrentRowX();
@@ -543,7 +543,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "wasNull");
             }
-            checkForClosedResultSet();
+            checkForClosedResultSet("wasNull");
 
             if (wasNull_ == ResultSet.WAS_NULL_UNSET) {
                 throw new SqlException(agent_.logWriter_, 
@@ -572,7 +572,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getBoolean", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getBoolean");
             boolean result = false;
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if (isOnInsertRow_ && updatedColumns_[column - 1] == null) {
@@ -606,7 +606,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getByte", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getByte");
             byte result = 0;
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if ((isOnInsertRow_) && (updatedColumns_[column - 1] == null)) {
@@ -640,7 +640,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getShort", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getShort");
             short result = 0;
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if (isOnInsertRow_ && updatedColumns_[column - 1] == null) {
@@ -674,7 +674,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getInt", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getInt");
             int result = 0;
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if (isOnInsertRow_ && updatedColumns_[column - 1] == null) {
@@ -708,7 +708,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getLong", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getLong");
             long result = 0;
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if (isOnInsertRow_ && updatedColumns_[column - 1] == null) {
@@ -742,7 +742,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getFloat", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getFloat");
             float result = 0;
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if ((isOnInsertRow_ && updatedColumns_[column - 1] == null)) {
@@ -776,7 +776,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getDouble", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getDouble");
             double result = 0;
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if (isOnInsertRow_ && updatedColumns_[column - 1] == null) {
@@ -811,7 +811,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceDeprecatedEntry(this, "getBigDecimal", column, scale);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getBigDecimal");
             java.math.BigDecimal result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result =
@@ -843,7 +843,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getBigDecimal", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getBigDecimal");
             java.math.BigDecimal result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result =
@@ -873,7 +873,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getDate", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getDate");
 
             if (cal == null) {
                 throw new SqlException(agent_.logWriter_,
@@ -916,7 +916,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getTime", column, cal);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getTime");
 
             if (cal == null) {
                 throw new SqlException(agent_.logWriter_,
@@ -961,7 +961,7 @@ public abstract class ResultSet implemen
                 agent_.logWriter_.traceEntry(
                         this, "getTimestamp", column, calendar);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getTimestamp");
 
             if (calendar == null) {
                 throw new SqlException(agent_.logWriter_,
@@ -1052,7 +1052,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getString", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getString");
             String result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result = (String) agent_.crossConverters_.setObject(java.sql.Types.CHAR, updatedColumns_[column - 1]);
@@ -1080,7 +1080,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getBytes", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getBytes");
             byte[] result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result = (byte[]) agent_.crossConverters_.setObject(java.sql.Types.BINARY, updatedColumns_[column - 1]);
@@ -1109,7 +1109,7 @@ public abstract class ResultSet implemen
                 agent_.logWriter_.traceEntry(this, "getBinaryStream", column);
             }
 
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getBinaryStream");
             useStreamOrLOB(column);
 
             java.io.InputStream result = null;
@@ -1140,7 +1140,7 @@ public abstract class ResultSet implemen
                 agent_.logWriter_.traceEntry(this, "getAsciiStream", column);
             }
 
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getAsciiStream");
             useStreamOrLOB(column);
 
             java.io.InputStream result = null;
@@ -1191,7 +1191,7 @@ public abstract class ResultSet implemen
                 agent_.logWriter_.traceEntry(this, "getCharacterStream", column);
             }
 
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getCharacterStream");
             useStreamOrLOB(column);
 
             java.io.Reader result = null;
@@ -1222,7 +1222,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getBlob", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getBlob");
             useStreamOrLOB(column);
             java.sql.Blob result = null;
             if (wasNonNullSensitiveUpdate(column)) {
@@ -1252,7 +1252,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getClob", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getClob");
             useStreamOrLOB(column);
             java.sql.Clob result = null;
             if (wasNonNullSensitiveUpdate(column)) {
@@ -1282,7 +1282,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getRef", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getRef");
             java.sql.Ref result = isNull(column) ? null : cursor_.getRef(column);
             if (true) {
                 throw new SqlException(agent_.logWriter_,
@@ -1309,7 +1309,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getArray", column);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getArray");
             java.sql.Array result = isNull(column) ? null : cursor_.getArray(column);
             if (true) {
                 throw new SqlException(agent_.logWriter_,
@@ -1350,7 +1350,7 @@ public abstract class ResultSet implemen
 
     // used by DBMD
     Object getObjectX(int column) throws SqlException {
-        checkGetterPreconditions(column);
+        checkGetterPreconditions(column, "getObject");
         Object result = null;
         if (wasNonNullSensitiveUpdate(column)) {
             result = updatedColumns_[column - 1];
@@ -1370,7 +1370,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getObject", column, map);
             }
-            checkGetterPreconditions(column);
+            checkGetterPreconditions(column, "getObject");
             Object result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result = updatedColumns_[column - 1];
@@ -1829,7 +1829,7 @@ public abstract class ResultSet implemen
      */
     public final java.sql.SQLWarning getWarnings() throws SQLException {
         try {
-            checkForClosedResultSet();
+            checkForClosedResultSet("getWarnings");
         } catch (SqlException se) {
             throw se.getSQLException();
         }
@@ -1853,7 +1853,7 @@ public abstract class ResultSet implemen
                 agent_.logWriter_.traceEntry(this, "clearWarnings");
             }
             try {
-                checkForClosedResultSet();
+                checkForClosedResultSet("clearWarnings");
             } catch (SqlException se) {
                 throw se.getSQLException();
             }
@@ -1873,7 +1873,7 @@ public abstract class ResultSet implemen
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "getCursorName");
                 }
-                checkForClosedResultSet();
+                checkForClosedResultSet("getCursorName");
                 if (generatedSection_ != null) {
                     return "stored procedure generated cursor:" + generatedSection_.getServerCursorName();
                 }
@@ -1912,7 +1912,7 @@ public abstract class ResultSet implemen
 
     // used by DBMD
     ColumnMetaData getMetaDataX() throws SqlException {
-        checkForClosedResultSet();
+        checkForClosedResultSet("getMetaData");
         return resultSetMetaData_;
     }
 
@@ -1939,7 +1939,7 @@ public abstract class ResultSet implemen
 
     // An untraced version of findColumn()
     private final int findColumnX(String columnName) throws SqlException {
-        checkForClosedResultSet();
+        checkForClosedResultSet("findColumn");
         return resultSetMetaData_.findColumnX(columnName);
     }
 
@@ -1951,7 +1951,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "isBeforeFirst");
             }
-            checkForClosedResultSet();
+            checkForClosedResultSet("isBeforeFirst");
             checkThatResultSetTypeIsScrollable();
             // Returns false if the ResultSet contains no rows.
             boolean isBeforeFirst = isBeforeFirstX();
@@ -1982,7 +1982,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "isAfterLast");
             }
-            checkForClosedResultSet();
+            checkForClosedResultSet("isAfterLast");
             checkThatResultSetTypeIsScrollable();
             // Returns false if the ResultSet contains no rows.
             boolean isAfterLast = isAfterLastX();
@@ -2015,7 +2015,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "isFirst");
             }
-            checkForClosedResultSet();
+            checkForClosedResultSet("isFirst");
             checkThatResultSetTypeIsScrollable();
             // Not necessary to get the rowCount_ since currentRowInRowset_ is initialized to -1,
             // and it will not be changed if there is no rows in the ResultSet.
@@ -2044,7 +2044,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "isLast");
             }
-            checkForClosedResultSet();
+            checkForClosedResultSet("isLast");
             checkThatResultSetTypeIsScrollable();
             // Returns false if the ResultSet contains no rows.
             boolean isLast = isLastX();
@@ -2075,7 +2075,7 @@ public abstract class ResultSet implemen
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "beforeFirst");
                 }
-                checkForClosedResultSet();
+                checkForClosedResultSet("beforeFirst");
                 checkThatResultSetTypeIsScrollable();
                 clearWarningsX();
                 beforeFirstX();
@@ -2116,7 +2116,7 @@ public abstract class ResultSet implemen
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "afterLast");
                 }
-                checkForClosedResultSet();
+                checkForClosedResultSet("afterLast");
                 checkThatResultSetTypeIsScrollable();
                 clearWarningsX();
                 afterLastX();
@@ -2170,7 +2170,7 @@ public abstract class ResultSet implemen
     }
 
     private boolean firstX() throws SqlException {
-        checkForClosedResultSet();
+        checkForClosedResultSet("first");
         checkThatResultSetTypeIsScrollable();
         clearWarningsX();
         
@@ -2225,7 +2225,7 @@ public abstract class ResultSet implemen
     }
 
     private boolean lastX() throws SqlException {
-        checkForClosedResultSet();
+        checkForClosedResultSet("last");
         checkThatResultSetTypeIsScrollable();
         clearWarningsX();
         
@@ -2290,7 +2290,7 @@ public abstract class ResultSet implemen
     }
 
     private int getRowX() throws SqlException {
-        checkForClosedResultSet();
+        checkForClosedResultSet("getRow");
         long row;
         checkThatResultSetIsNotDynamic();
         if (resultSetType_ == java.sql.ResultSet.TYPE_FORWARD_ONLY)
@@ -2342,7 +2342,7 @@ public abstract class ResultSet implemen
     }
 
     public boolean absoluteX(int row) throws SqlException {
-        checkForClosedResultSet();
+        checkForClosedResultSet("absolute");
         checkThatResultSetTypeIsScrollable();
         clearWarningsX();
 
@@ -2427,7 +2427,7 @@ public abstract class ResultSet implemen
     }
 
     private boolean relativeX(int rows) throws SqlException {
-        checkForClosedResultSet();
+        checkForClosedResultSet("relative");
         checkThatResultSetTypeIsScrollable();
         clearWarningsX();
         
@@ -2553,7 +2553,7 @@ public abstract class ResultSet implemen
     }
 
     private boolean previousX() throws SqlException {
-        checkForClosedResultSet();
+        checkForClosedResultSet("previous");
         checkThatResultSetTypeIsScrollable();
         clearWarningsX();
         
@@ -2603,7 +2603,7 @@ public abstract class ResultSet implemen
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "setFetchDirection", direction);
                 }
-                checkForClosedResultSet();
+                checkForClosedResultSet("setFetchDirection");
                 checkThatResultSetTypeIsScrollable();
 
                 switch (direction) {
@@ -2628,7 +2628,7 @@ public abstract class ResultSet implemen
     public int getFetchDirection() throws SQLException {
         try
         {
-            checkForClosedResultSet();
+            checkForClosedResultSet("getFetchDirection");
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceExit(this, "getFetchDirection", fetchDirection_);
             }
@@ -2647,7 +2647,7 @@ public abstract class ResultSet implemen
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "setFetchSize", rows);
                 }
-                checkForClosedResultSet();
+                checkForClosedResultSet("setFetchSize");
                 if (rows < 0 || (maxRows_ != 0 && rows > maxRows_)) {
                     throw new SqlException(agent_.logWriter_, 
                         new ClientMessageId(SQLState.INVALID_FETCH_SIZE),
@@ -2668,7 +2668,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceExit(this, "getFetchSize", fetchSize_);
             }
-            checkForClosedResultSet();
+            checkForClosedResultSet("getFetchSize");
             return suggestedFetchSize_;
         }
         catch ( SqlException se )
@@ -2683,7 +2683,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceExit(this, "getType", resultSetType_);
             }
-            checkForClosedResultSet();
+            checkForClosedResultSet("getType");
             return resultSetType_;
         }
         catch ( SqlException se )
@@ -2698,7 +2698,7 @@ public abstract class ResultSet implemen
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceExit(this, "getConcurrency", resultSetConcurrency_);
             }
-            checkForClosedResultSet();
+            checkForClosedResultSet("getConcurrency");
             return resultSetConcurrency_;
         }
         catch ( SqlException se )
@@ -2712,7 +2712,7 @@ public abstract class ResultSet implemen
     public boolean rowUpdated() throws SQLException {
         try
         {
-            checkForClosedResultSet();
+            checkForClosedResultSet("rowUpdated");
             checkPositionedOnPlainRow();
 
             boolean rowUpdated = cursor_.getIsRowUpdated();
@@ -2731,7 +2731,7 @@ public abstract class ResultSet implemen
     public boolean rowInserted() throws SQLException {
         try
         {
-            checkForClosedResultSet();
+            checkForClosedResultSet("rowInserted");
             checkPositionedOnPlainRow();
 
             boolean rowInserted = false;
@@ -2753,7 +2753,7 @@ public abstract class ResultSet implemen
     public boolean rowDeleted() throws SQLException {
         try
         {
-            checkForClosedResultSet();
+            checkForClosedResultSet("rowDeleted");
             checkPositionedOnPlainRow();
 
             boolean rowDeleted = 
@@ -3420,8 +3420,8 @@ public abstract class ResultSet implemen
     }
 
     private void insertRowX() throws SqlException {
-        checkForClosedResultSet();
-	checkForUpdatableResultSet("insertRow");
+        checkForClosedResultSet("insertRow");
+        checkForUpdatableResultSet("insertRow");
         if (isOnCurrentRow_) {
             throw new SqlException(agent_.logWriter_, 
                 new ClientMessageId(SQLState.CURSOR_NOT_POSITIONED_ON_INSERT_ROW));
@@ -3491,7 +3491,7 @@ public abstract class ResultSet implemen
 
     //if no updateXXX were issued before this updateRow, then return false
     private boolean updateRowX() throws SqlException {
-        checkForClosedResultSet();
+        checkForClosedResultSet("updateRow");
         
         checkForUpdatableResultSet("updateRow");
         
@@ -3611,7 +3611,7 @@ public abstract class ResultSet implemen
     }
 
     private void deleteRowX() throws SqlException {
-        checkForClosedResultSet();
+        checkForClosedResultSet("deleteRow");
         
         checkForUpdatableResultSet("deleteRow");
 
@@ -3666,7 +3666,7 @@ public abstract class ResultSet implemen
     }
 
     private void refreshRowX() throws SqlException {
-        checkForClosedResultSet();
+        checkForClosedResultSet("refreshRow");
         checkThatResultSetTypeIsScrollable();
 	checkForUpdatableResultSet("refreshRow");
         if (isBeforeFirstX() || isAfterLastX() || isOnInsertRow_) {
@@ -3695,7 +3695,7 @@ public abstract class ResultSet implemen
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "cancelRowUpdates");
                 }
-                checkForClosedResultSet();
+                checkForClosedResultSet("cancelRowUpdates");
                 checkForUpdatableResultSet("cancelRowUpdates");
                 if (isOnInsertRow_) {
                     throw new SqlException(agent_.logWriter_, 
@@ -3723,7 +3723,7 @@ public abstract class ResultSet implemen
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "moveToInsertRow");
                 }
-                checkForClosedResultSet();
+                checkForClosedResultSet("moveToInsertRow");
                 checkForUpdatableResultSet("moveToInsertRow");
 
                 resetUpdatedColumnsForInsert();
@@ -3746,7 +3746,7 @@ public abstract class ResultSet implemen
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "moveToCurrentRow");
                 }
-                checkForClosedResultSet();
+                checkForClosedResultSet("moveToCurrentRow");
                 checkForUpdatableResultSet("moveToCurrentRow");
 
                 moveToCurrentRowX();
@@ -3796,7 +3796,7 @@ public abstract class ResultSet implemen
      */
     public java.sql.Statement getStatement() throws SQLException {
         try {
-            checkForClosedResultSet();
+            checkForClosedResultSet("getStatement");
         } catch (SqlException se) {
             throw se.getSQLException();
         }
@@ -4715,8 +4715,9 @@ public abstract class ResultSet implemen
         return firstRowInRowset_ + currentRowInRowset_;
     }
 
-    private final void checkGetterPreconditions(int column) throws SqlException {
-        checkForClosedResultSet();
+    private final void checkGetterPreconditions(int column, String operation)
+            throws SqlException {
+        checkForClosedResultSet(operation);
         checkForValidColumnIndex(column);
         checkForValidCursorPosition();
     }
@@ -4725,7 +4726,7 @@ public abstract class ResultSet implemen
 						String operation)
 	throws SqlException {
 
-        checkForClosedResultSet();
+        checkForClosedResultSet(operation);
         checkForValidColumnIndex(column);
 	checkForUpdatableResultSet(operation);
 
@@ -4753,11 +4754,12 @@ public abstract class ResultSet implemen
         }
     }
 
-    protected final void checkForClosedResultSet() throws SqlException {
+    protected final void checkForClosedResultSet(String operation)
+            throws SqlException {
         if (!openOnClient_) {
             agent_.checkForDeferredExceptions();
-            throw new SqlException(agent_.logWriter_, 
-                new ClientMessageId(SQLState.CLIENT_RESULT_SET_NOT_OPEN));
+            throw new SqlException(agent_.logWriter_, new ClientMessageId(
+                    SQLState.LANG_RESULT_SET_NOT_OPEN), operation);
         } else {
             agent_.checkForDeferredExceptions();
         }
@@ -5529,7 +5531,7 @@ public abstract class ResultSet implemen
             agent_.logWriter_.traceEntry(this, "getHoldability");
         }
         try {
-            checkForClosedResultSet();
+            checkForClosedResultSet("getHoldability");
         } catch (SqlException se) {
             throw se.getSQLException();
         }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/SectionManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/SectionManager.java?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/SectionManager.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/SectionManager.java Sat Aug 14 18:00:36 2010
@@ -193,7 +193,7 @@ public class SectionManager {
         ResultSet rs = (ResultSet) ((WeakReference) (positionedUpdateCursorNameToResultSet_.get(cursorName))).get();
         if (rs == null) {
             throw new SqlException(agent_.logWriter_, 
-                new ClientMessageId(SQLState.CLIENT_RESULT_SET_NOT_OPEN));
+                new ClientMessageId(SQLState.LANG_RESULT_SET_NOT_OPEN), "next");
         }
         return (rs.resultSetType_ == java.sql.ResultSet.TYPE_FORWARD_ONLY) ? null : rs;
     }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java Sat Aug 14 18:00:36 2010
@@ -160,7 +160,7 @@ public class NetResultSet40 extends NetR
      */
     public boolean isWrapperFor(Class<?> interfaces) throws SQLException {
         try {
-            checkForClosedResultSet();
+            checkForClosedResultSet("isWrapperFor");
         } catch (SqlException se) {
             throw se.getSQLException();
         }
@@ -178,7 +178,7 @@ public class NetResultSet40 extends NetR
     public <T> T unwrap(java.lang.Class<T> interfaces)
                                    throws SQLException {
         try { 
-            checkForClosedResultSet();
+            checkForClosedResultSet("unwrap");
             return interfaces.cast(this);
         } catch (ClassCastException cce) {
             throw new SqlException(null,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml Sat Aug 14 18:00:36 2010
@@ -3889,17 +3889,12 @@ ln=lower-case two-letter ISO-639 languag
             </msg>
 
             <msg>
-                <name>XCL16.S.0</name>
+                <name>XCL16.S</name>
                 <text>ResultSet not open. Operation '{0}' not permitted. Verify that autocommit is OFF.</text>
                 <arg>operation</arg>
             </msg>
 
             <msg>
-                <name>XCL16.S.1</name>
-                <text>ResultSet not open.  Verify that autocommit is OFF.</text>
-            </msg>
-
-            <msg>
                 <name>XCL18.S</name>
                 <text>Stream or LOB value cannot be retrieved more than once</text>
             </msg>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties Sat Aug 14 18:00:36 2010
@@ -1101,9 +1101,7 @@ XCL12.S=Byl u\u010din\u011bn pokus o vlo
 XCL13.S=Pozice parametru ''{0}'' je mimo rozsah. Po\u010det parametr\u016f pro tento p\u0159ipraven\u00fd p\u0159\u00edkaz je ''{1}''.
 XCL14.S=Pozice sloupce ''{0}'' je mimo rozsah. Po\u010det sloupc\u016f pro tuto mno\u017einu v\u00fdsledk\u016f je ''{1}''.
 XCL15.S=Vyskytla se v\u00fdjimka ClassCastException p\u0159i vol\u00e1n\u00ed metody compareTo() na objekt ''{0}''. Parametr metody compareTo() je ze t\u0159\u00eddy ''{1}''.
-XCL16.S.0=Mno\u017eina v\u00fdsledk\u016f nen\u00ed otev\u0159ena. Operace ''{0}'' nen\u00ed povolena. Ov\u011b\u0159te, \u017ee automatick\u00e9 potvrzov\u00e1n\u00ed je VYPNUTO.
-# This one is used for the network client, where we don't know what operation is being performed.
-XCL16.S.1=Mno\u017eina v\u00fdsledk\u016f nen\u00ed otev\u0159ena. Ov\u011b\u0159te, \u017ee automatick\u00e9 potvrzov\u00e1n\u00ed je VYPNUTO.
+XCL16.S=Mno\u017eina v\u00fdsledk\u016f nen\u00ed otev\u0159ena. Operace ''{0}'' nen\u00ed povolena. Ov\u011b\u0159te, \u017ee automatick\u00e9 potvrzov\u00e1n\u00ed je VYPNUTO.
 XCL19.S=Chyb\u00ed \u0159\u00e1dek v tabulce ''{0}'' pro kl\u00ed\u010d ''{1}''.
 XCL20.S=Katalogy na \u00farovni verze ''{0}'' nelze pov\u00fd\u0161it na \u00farove\u0148 verze ''{1}''.
 XCL21.S=Pokou\u0161\u00edte se prov\u00e9st p\u0159\u00edkaz definice dat (CREATE, DROP nebo ALTER) p\u0159i p\u0159\u00edprav\u011b odli\u0161n\u00e9ho p\u0159\u00edkazu. Takov\u00fd p\u0159\u00edpad nen\u00ed povolen. K tomu m\u016f\u017ee doj\u00edt, pokud provedete p\u0159\u00edkaz definice dat ze statick\u00e9ho inicializ\u00e1toru t\u0159\u00eddy Javy, kter\u00e1 je pou\u017e\u00edv\u00e1na v p\u0159\u00edkazu SQL.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties Sat Aug 14 18:00:36 2010
@@ -948,8 +948,7 @@ XCL12.S=Es wurde versucht, einen Datenwe
 XCL13.S=Die Parameterposition ''{0}'' liegt au\u00DFerhalb des Bereichs. Die Parameteranzahl f\u00FCr diese vorbereitete Anweisung ist ''{1}''.
 XCL14.S=Die Spaltenposition ''{0}'' befindet sich au\u00DFerhalb des Bereichs. Die Anzahl der Spalten f\u00FCr dieses ResultSet liegt bei ''{1}''.
 XCL15.S=Beim Aufrufen der Methode compareTo() f\u00FCr ein Objekt ''{0}'' ist eine ClassCastException eingetreten. Der Parameter f\u00FCr compareTo() geh\u00F6rt zur Klasse ''{1}''.
-XCL16.S.0=Das ResultSet ist nicht ge\u00F6ffnet. Die Operation ''{0}'' ist unzul\u00E4ssig. Pr\u00FCfen Sie, ob das automatische Festschreiben inaktiviert ist.
-XCL16.S.1=Das ResultSet ist nicht offen. Pr\u00FCfen Sie, ob das automatische Festschreiben inaktiviert ist.
+XCL16.S=Das ResultSet ist nicht ge\u00F6ffnet. Die Operation ''{0}'' ist unzul\u00E4ssig. Pr\u00FCfen Sie, ob das automatische Festschreiben inaktiviert ist.
 XCL18.S=Der Datenstrom- oder LOB-Wert kann nicht mehrmals abgerufen werden
 XCL19.S=In der Tabelle ''{0}'' fehlt die Zeile f\u00FCr den Schl\u00FCssel ''{1}''.
 XCL20.S=F\u00FCr Kataloge mit dem Versionsstand ''{0}'' kann kein Upgrade auf den Versionsstand ''{1}'' durchgef\u00FChrt werden.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties Sat Aug 14 18:00:36 2010
@@ -948,8 +948,7 @@ XCL12.S=Se ha intentado colocar un valor
 XCL13.S=La posici\u00F3n del par\u00E1metro ''{0}'' est\u00E1 fuera de rango.  El n\u00FAmero de par\u00E1metros de esta sentencia preparada es ''{1}''.
 XCL14.S=La posici\u00F3n de la columna ''{0}'' est\u00E1 fuera de rango.  El n\u00FAmero de columnas de esta sentencia ResultSet es ''{1}''.
 XCL15.S=Se ha producido una ClassCastException al llamar al m\u00E9todo compareTo() sobre un objeto ''{0}''.  El par\u00E1metro para compareTo() es de clase ''{1}''.
-XCL16.S.0=ResultSet no abierto. Operaci\u00F3n ''{0}'' no permitida. Verifique que AutoCommit sea OFF.
-XCL16.S.1=ResultSet no abierto.  Verifique que AutoCommit sea OFF.
+XCL16.S=ResultSet no abierto. Operaci\u00F3n ''{0}'' no permitida. Verifique que AutoCommit sea OFF.
 XCL18.S=El valor de flujo o LOB no se puede recuperar m\u00E1s de una vez
 XCL19.S=Falta fila en la tabla ''{0}'' para la clave ''{1}''.
 XCL20.S=Los cat\u00E1logos del nivel de versi\u00F3n ''{0}'' no pueden actualizarse al nivel de versi\u00F3n ''{1}''.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties Sat Aug 14 18:00:36 2010
@@ -948,8 +948,7 @@ XCL12.S=Une tentative de placement d''un
 XCL13.S=La position de param\u00E8tre ''{0}'' est en dehors des limites.  Le nombre de param\u00E8tres pour cette instruction pr\u00E9par\u00E9e est ''{1}''.
 XCL14.S=La position de colonne ''{0}'' est en dehors des limites.  Le nombre de colonnes de ce ResultSet est ''{1}''.
 XCL15.S=Une exception ClassCastException s''est produite lors de l''appel de la m\u00E9thode compareTo() sur un objet ''{0}''.  Le param\u00E8tre pour compareTo() est de classe ''{1}''.
-XCL16.S.0=L''\u00E9l\u00E9ment ResultSet n''est pas ouvert. L''op\u00E9ration ''{0}'' n''est pas autoris\u00E9e. V\u00E9rifiez que la fonction de validation automatique est d\u00E9sactiv\u00E9e (OFF).
-XCL16.S.1=L''\u00E9l\u00E9ment ResultSet n''est pas ouvert.  V\u00E9rifiez que la fonction de validation automatique est d\u00E9sactiv\u00E9e (OFF).
+XCL16.S=L''\u00E9l\u00E9ment ResultSet n''est pas ouvert. L''op\u00E9ration ''{0}'' n''est pas autoris\u00E9e. V\u00E9rifiez que la fonction de validation automatique est d\u00E9sactiv\u00E9e (OFF).
 XCL18.S=Le flux ou la valeur LOB ne peut pas \u00EAtre extrait(e) plus d'une fois
 XCL19.S=Ligne manquante dans la table ''{0}'' pour la cl\u00E9 ''{1}''.
 XCL20.S=Les catalogues dont le niveau de version est ''{0}'' ne peuvent pas \u00EAtre mis \u00E0 niveau vers le niveau de version ''{1}''.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties Sat Aug 14 18:00:36 2010
@@ -1101,9 +1101,7 @@ XCL12.S=''{0}'' t\u00edpus\u00fa adat\u0
 XCL13.S=A(z) ''{0}'' param\u00e9terpoz\u00edci\u00f3 k\u00edv\u00fcl van a megengedett tartom\u00e1nyon.  Az el\u0151k\u00e9sz\u00edtett utas\u00edt\u00e1s param\u00e9tereinek sz\u00e1ma ''{1}''.
 XCL14.S=A(z) ''{0}'' oszloppoz\u00edci\u00f3 k\u00edv\u00fcl van a megengedett tartom\u00e1nyon.  A ResultSet oszlopainak sz\u00e1ma ''{1}''.
 XCL15.S=ClassCastException t\u00f6rt\u00e9nt a compareTo() met\u00f3dus ''{0}'' objektumon megh\u00edv\u00e1sa sor\u00e1n.  A compareTo() param\u00e9tere ''{1}'' oszt\u00e1ly\u00fa.
-XCL16.S.0=A ResultSet nincs megnyitva. A(z) ''{0}'' m\u0171velet nem megengedett. Ellen\u0151rizze, hogy az autocommit ki van-e kapcsolva (OFF).
-# This one is used for the network client, where we don't know what operation is being performed.
-XCL16.S.1=A ResultSet nincs megnyitva.  Ellen\u0151rizze, hogy az autocommit ki van-e kapcsolva (OFF).
+XCL16.S=A ResultSet nincs megnyitva. A(z) ''{0}'' m\u0171velet nem megengedett. Ellen\u0151rizze, hogy az autocommit ki van-e kapcsolva (OFF).
 XCL19.S=A(z) ''{0}'' t\u00e1bl\u00e1ban a(z) ''{1}'' kulcshoz tartoz\u00f3 sor hi\u00e1nyzik.
 XCL20.S=A katal\u00f3gusok ''{0}'' v\u00e1ltozatszinten nem friss\u00edthet\u0151k ''{1}'' v\u00e1ltozatszintre.
 XCL21.S=Adatdefin\u00edci\u00f3s utas\u00edt\u00e1st (CREATE, DROP vagy ALTER) pr\u00f3b\u00e1l v\u00e9grehajtani egy m\u00e1sik utas\u00edt\u00e1s el\u0151k\u00e9sz\u00edt\u00e9se sor\u00e1n. Ez nem enged\u00e9lyezett. Ez akkor t\u00f6rt\u00e9nhet, ha adatdefin\u00edci\u00f3s utas\u00edt\u00e1st hajt v\u00e9gre egy SQL utas\u00edt\u00e1sban haszn\u00e1lni k\u00edv\u00e1nt Java oszt\u00e1ly statikus inicializ\u00e1l\u00f3j\u00e1b\u00f3l.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties Sat Aug 14 18:00:36 2010
@@ -948,8 +948,7 @@ XCL12.S=\u00C8 stato effettuato un tenta
 XCL13.S=La posizione del parametro ''{0}'' non \u00E8 compresa nell''intervallo.  Il numero dei parametri per questa istruzione preparata \u00E8 ''{1}''.
 XCL14.S=La posizione della colonna ''{0}'' non \u00E8 compresa nell''intervallo.  Il numero di colonne per ResultSet \u00E8 ''{1}''.
 XCL15.S=Si \u00E8 verificata una ClassCastException durante la chiamata del metodo compareTo() su un oggetto ''{0}''.  Il parametro sul metodo compareTo() \u00E8 di classe ''{1}''.
-XCL16.S.0=ResultSet non aperto. Operazione {0} non consentita. Verificare che l''autocommit sia in modalit\u00E0 OFF.
-XCL16.S.1=ResultSet non aperto.  Verificare che l''autocommit sia in modalit\u00E0 OFF.
+XCL16.S=ResultSet non aperto. Operazione {0} non consentita. Verificare che l''autocommit sia in modalit\u00E0 OFF.
 XCL18.S=Valore LOB o flusso non recuperabile pi\u00F9 di una volta
 XCL19.S=Riga mancante nella tabella ''{0}'' per la chiave ''{1}''.
 XCL20.S=Impossibile aggiornare i cataloghi a livello della versione ''{0}'' al livello della versione ''{1}''.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties Sat Aug 14 18:00:36 2010
@@ -946,8 +946,7 @@ XCL12.S=\u578B ''{0}'' \u306E\u30C7\u30F
 XCL13.S=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u4F4D\u7F6E ''{0}'' \u306F\u7BC4\u56F2\u5916\u3067\u3059\u3002  \u3053\u306E\u6E96\u5099\u6E08\u307F\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u6570\u306F ''{1}'' \u3067\u3059\u3002
 XCL14.S=\u5217\u4F4D\u7F6E ''{0}'' \u306F\u7BC4\u56F2\u5916\u3067\u3059\u3002  \u3053\u306E ResultSet \u306B\u5BFE\u3059\u308B\u5217\u6570\u306F ''{1}'' \u3067\u3059\u3002
 XCL15.S=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8 ''{0}'' \u306B\u304A\u3044\u3066 compareTo() \u30E1\u30BD\u30C3\u30C9\u3092\u547C\u3073\u51FA\u3057\u3066\u3044\u308B\u3068\u304D\u306B ClassCastException \u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002  compareTo() \u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306F\u30AF\u30E9\u30B9 ''{1}'' \u3067\u3059\u3002
-XCL16.S.0=ResultSet \u304C\u30AA\u30FC\u30D7\u30F3\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 \u30AA\u30DA\u30EC\u30FC\u30B7\u30E7\u30F3 ''{0}'' \u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093\u3002 \u81EA\u52D5\u30B3\u30DF\u30C3\u30C8\u304C\u30AA\u30D5\u306B\u306A\u3063\u3066\u3044\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-XCL16.S.1=ResultSet \u304C\u30AA\u30FC\u30D7\u30F3\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002  \u81EA\u52D5\u30B3\u30DF\u30C3\u30C8\u304C\u30AA\u30D5\u306B\u306A\u3063\u3066\u3044\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+XCL16.S=ResultSet \u304C\u30AA\u30FC\u30D7\u30F3\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 \u30AA\u30DA\u30EC\u30FC\u30B7\u30E7\u30F3 ''{0}'' \u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093\u3002 \u81EA\u52D5\u30B3\u30DF\u30C3\u30C8\u304C\u30AA\u30D5\u306B\u306A\u3063\u3066\u3044\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 XCL18.S=\u30B9\u30C8\u30EA\u30FC\u30E0\u307E\u305F\u306F LOB \u5024\u306F 2 \u56DE\u4EE5\u4E0A\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
 XCL19.S=\u8868 ''{0}'' \u306B\u30AD\u30FC ''{1}'' \u306B\u5BFE\u3059\u308B\u884C\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 XCL20.S=\u30D0\u30FC\u30B8\u30E7\u30F3\u30FB\u30EC\u30D9\u30EB ''{0}'' \u306E\u30AB\u30BF\u30ED\u30B0\u3092\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u30FB\u30EC\u30D9\u30EB ''{1}'' \u306B\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties Sat Aug 14 18:00:36 2010
@@ -949,8 +949,7 @@ XCL12.S=\uC720\uD615\uC774 ''{0}''\uC778
 XCL13.S=''{0}'' \uB9E4\uAC1C\uBCC0\uC218 \uC704\uCE58\uAC00 \uBC94\uC704\uB97C \uBC97\uC5B4\uB0AC\uC2B5\uB2C8\uB2E4. \uC774 \uC900\uBE44 \uBA85\uB839\uBB38\uC758 \uB9E4\uAC1C\uBCC0\uC218 \uC218\uB294 ''{1}''\uC785\uB2C8\uB2E4.
 XCL14.S=''{0}'' \uC5F4 \uC704\uCE58\uAC00 \uBC94\uC704\uB97C \uBC97\uC5B4\uB0AC\uC2B5\uB2C8\uB2E4. \uC774 ResultSet\uC758 \uC5F4 \uC218\uB294 ''{1}''\uC785\uB2C8\uB2E4.
 XCL15.S=''{0}'' \uC624\uBE0C\uC81D\uD2B8\uC5D0\uC11C compareTo() \uBA54\uC18C\uB4DC\uB97C \uD638\uCD9C\uD560 \uB54C ClassCastException\uC774 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. compareTo()\uC5D0 \uB300\uD55C \uB9E4\uAC1C\uBCC0\uC218\uC758 \uD074\uB798\uC2A4\uB294 ''{1}''\uC785\uB2C8\uB2E4.
-XCL16.S.0=Resultset\uC774 \uC5F4\uB9AC\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4. ''{0}'' \uC870\uC791\uC740 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC790\uB3D9 \uD655\uC57D\uC774 OFF\uC778\uC9C0 \uD655\uC778\uD558\uC2ED\uC2DC\uC624.
-XCL16.S.1=Resultset\uC774 \uC5F4\uB9AC\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4. \uC790\uB3D9 \uD655\uC57D\uC774 OFF\uC778\uC9C0 \uD655\uC778\uD558\uC2ED\uC2DC\uC624.
+XCL16.S=Resultset\uC774 \uC5F4\uB9AC\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4. ''{0}'' \uC870\uC791\uC740 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC790\uB3D9 \uD655\uC57D\uC774 OFF\uC778\uC9C0 \uD655\uC778\uD558\uC2ED\uC2DC\uC624.
 XCL18.S=\uC2A4\uD2B8\uB9BC \uB610\uB294 LOB \uAC12\uC744 \uB450 \uBC88 \uC774\uC0C1 \uAC80\uC0C9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 XCL19.S=''{1}'' \uD0A4\uC758 ''{0}'' \uD14C\uC774\uBE14\uC5D0\uC11C \uD589\uC774 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 XCL20.S=\uBC84\uC804 \uB808\uBCA8 ''{0}''\uC758 \uCE74\uD0C8\uB85C\uADF8\uB97C \uBC84\uC804 \uB808\uBCA8 ''{1}''(\uC73C)\uB85C \uC5C5\uADF8\uB808\uC774\uB4DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties Sat Aug 14 18:00:36 2010
@@ -1101,9 +1101,7 @@ XCL12.S=Wyst\u0105pi\u0142a pr\u00f3ba w
 XCL13.S=Pozycja parametru ''{0}'' jest poza zakresem. Liczba parametr\u00f3w dla tej przygotowanej instrukcji to ''{1}''.
 XCL14.S=Pozycja kolumny ''{0}'' jest poza zakresem. Liczba kolumn dla tego obiektu ResultSet to ''{1}''.
 XCL15.S=Wyst\u0105pi\u0142 wyj\u0105tek ClassCastException podczas wywo\u0142ywania metody compareTo() dla obiektu ''{0}''. Parametr metody compareTo() jest z klasy ''{1}''.
-XCL16.S.0=Obiekt ResultSet nie jest otwarty. Operacja ''{0}'' nie jest dozwolona. Sprawd\u017a, czy funkcja automatycznego zatwierdzania jest wy\u0142\u0105czona (OFF).
-# This one is used for the network client, where we don't know what operation is being performed.
-XCL16.S.1=Obiekt ResultSet nie jest otwarty. Sprawd\u017a, czy funkcja automatycznego zatwierdzania jest wy\u0142\u0105czona (OFF).
+XCL16.S=Obiekt ResultSet nie jest otwarty. Operacja ''{0}'' nie jest dozwolona. Sprawd\u017a, czy funkcja automatycznego zatwierdzania jest wy\u0142\u0105czona (OFF).
 XCL19.S=Brak wiersza w tabeli ''{0}'' dla klucza ''{1}''.
 XCL20.S=Katalogi w wersji ''{0}'' nie mog\u0105 by\u0107 aktualizowane do wersji ''{1}''.
 XCL21.S=Pr\u00f3ba wykonania instrukcji definicji danych (CREATE, DROP lub ALTER) podczas przygotowywania innej instrukcji. To nie jest dozwolone. Mo\u017ce si\u0119 to zdarzy\u0107 podczas wywo\u0142ywania instrukcji definicji danych z inicjatora statycznego klasy Java, kt\u00f3ry jest u\u017cywany w instrukcji SQL.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties Sat Aug 14 18:00:36 2010
@@ -1097,9 +1097,7 @@ XCL12.S=Tentativa de colocar um valor de
 XCL13.S=A posi\u00e7\u00e3o do par\u00e2metro ''{0}'' est\u00e1 fora da faixa.  O n\u00famero de par\u00e2metros desta instru\u00e7\u00e3o preparada \u00e9 ''{1}''.
 XCL14.S=A posi\u00e7\u00e3o da coluna ''{0}'' est\u00e1 fora da faixa.  O n\u00famero de colunas desse ResultSet \u00e9 ''{1}''.
 XCL15.S=Ocorreu uma ClassCastException ao chamar o m\u00e9todo compareTo() no objeto ''{0}''.  O par\u00e2metro para compareTo() \u00e9 da classe ''{1}''.
-XCL16.S.0=O ResultSet n\u00e3o est\u00e1 aberto. A opera\u00e7\u00e3o ''{0}'' n\u00e3o \u00e9 permitida. Verifique se a auto-efetiva\u00e7\u00e3o est\u00e1 desabilitada.
-# This one is used for the network client, where we don't know what operation is being performed.
-XCL16.S.1=O ResultSet n\u00e3o est\u00e1 abero.  Verifique se a auto-efetiva\u00e7\u00e3o est\u00e1 desabilitada.
+XCL16.S=O ResultSet n\u00e3o est\u00e1 aberto. A opera\u00e7\u00e3o ''{0}'' n\u00e3o \u00e9 permitida. Verifique se a auto-efetiva\u00e7\u00e3o est\u00e1 desabilitada.
 XCL19.S=Faltando a linha da tabela ''{0}'' para a chave ''{1}''.
 XCL20.S=Os cat\u00e1logos no n\u00edvel de vers\u00e3o ''{0}'' n\u00e3o podem ser atualizados para o n\u00edvel de vers\u00e3o ''{1}''.
 XCL21.S=Tentativa de executar uma instru\u00e7\u00e3o de defini\u00e7\u00e3o de dados (CREATE, DROP ou ALTER) durante a prepara\u00e7\u00e3o de uma instru\u00e7\u00e3o diferente. Isto n\u00e3o \u00e9 permitido. Isto pode ocorrer se for executada uma instru\u00e7\u00e3o de defini\u00e7\u00e3o de dados de dentro de um inicializador est\u00e1tico de uma classe Java que est\u00e1 sendo utilizada de dentro de uma instru\u00e7\u00e3o SQL.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties Sat Aug 14 18:00:36 2010
@@ -1101,9 +1101,7 @@ XCL12.S=\u041f\u0440\u0435\u0434\u043f\u
 XCL13.S=\u041f\u043e\u0437\u0438\u0446\u0438\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430 ''{0}'' \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u0432\u043d\u0435 \u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u043e\u0433\u043e \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430.  \u0427\u0438\u0441\u043b\u043e \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 \u0434\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u043f\u043e\u0434\u0433\u043e\u0442\u043e\u0432\u043b\u0435\u043d\u043d\u043e\u0433\u043e \u043e\u043f\u0435\u0440\u0430\u0442\u043e\u0440\u0430 \u0440\u0430\u0432\u043d\u043e ''{1}''.
 XCL14.S=\u041f\u043e\u0437\u0438\u0446\u0438\u044f \u0441\u0442\u043e\u043b\u0431\u0446\u0430 ''{0}'' \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u0432\u043d\u0435 \u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u043e\u0433\u043e \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430.  \u0427\u0438\u0441\u043b\u043e \u0441\u0442\u043e\u043b\u0431\u0446\u043e\u0432 \u0434\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u043d\u0430\u0431\u043e\u0440\u0430 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 \u0440\u0430\u0432\u043d\u043e ''{1}''.
 XCL15.S=\u041f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u043e \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 ClassCastException \u043f\u0440\u0438 \u0432\u044b\u0437\u043e\u0432\u0435 \u043c\u0435\u0442\u043e\u0434\u0430 compareTo() \u0434\u043b\u044f \u043e\u0431\u044a\u0435\u043a\u0442\u0430 ''{0}''.  \u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u043c \u0434\u043b\u044f compareTo() \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043a\u043b\u0430\u0441\u0441 ''{1}''.
-XCL16.S.0=\u041d\u0430\u0431\u043e\u0440 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 (ResultSet) \u043d\u0435 \u043e\u0442\u043a\u0440\u044b\u0442. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f ''{0}'' \u043d\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0430. \u0423\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u043e\u043f\u0446\u0438\u044f \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u043f\u0440\u0438\u043d\u044f\u0442\u0438\u044f \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0430 (OFF).
-# This one is used for the network client, where we don't know what operation is being performed.
-XCL16.S.1=\u041d\u0430\u0431\u043e\u0440 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 (ResultSet) \u043d\u0435 \u043e\u0442\u043a\u0440\u044b\u0442.  \u0423\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u043e\u043f\u0446\u0438\u044f \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u043f\u0440\u0438\u043d\u044f\u0442\u0438\u044f \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0430 (OFF).
+XCL16.S=\u041d\u0430\u0431\u043e\u0440 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 (ResultSet) \u043d\u0435 \u043e\u0442\u043a\u0440\u044b\u0442. \u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f ''{0}'' \u043d\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0430. \u0423\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u043e\u043f\u0446\u0438\u044f \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u043f\u0440\u0438\u043d\u044f\u0442\u0438\u044f \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0430 (OFF).
 XCL19.S=\u041e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0441\u0442\u0440\u043e\u043a\u0430 \u0432 \u0442\u0430\u0431\u043b\u0438\u0446\u0435 ''{0}'' \u0434\u043b\u044f \u043a\u043b\u044e\u0447\u0430 ''{1}''.
 XCL20.S=\u041a\u0430\u0442\u0430\u043b\u043e\u0433\u0438 \u0432\u0435\u0440\u0441\u0438\u0438 \u0443\u0440\u043e\u0432\u043d\u044f ''{0}'' \u043d\u0435\u043b\u044c\u0437\u044f \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0434\u043e \u0432\u0435\u0440\u0441\u0438\u0438 \u0443\u0440\u043e\u0432\u043d\u044f ''{1}''.
 XCL21.S=\u0412\u044b \u043f\u044b\u0442\u0430\u0435\u0442\u0435\u0441\u044c \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043e\u043f\u0435\u0440\u0430\u0442\u043e\u0440 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445 (CREATE, DROP \u0438\u043b\u0438 ALTER) \u043f\u0440\u0438 \u043f\u043e\u0434\u0433\u043e\u0442\u043e\u0432\u043a\u0435 \u0434\u0440\u0443\u0433\u043e\u0433\u043e \u043e\u043f\u0435\u0440\u0430\u0442\u043e\u0440\u0430. \u042d\u0442\u043e \u043d\u0435 \u0434\u043e\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f. \u042d\u0442\u043e \u043c\u043e\u0436\u0435\u0442 \u043f\u0440\u043e\u0438\u0441\u0445\u043e\u0434\u0438\u0442\u044c, \u0435\u0441\u043b\u0438 \u0432\u044b \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0435 \u043e\u043f\u0435\u0440\u0430\u0442\u043e\u0440 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445 \u0438\u0437 \u0
 441\u0442\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0430\u0442\u043e\u0440\u0430 \u043a\u043b\u0430\u0441\u0441\u0430 Java, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0438\u0437 \u043e\u043f\u0435\u0440\u0430\u0442\u043e\u0440\u0430 SQL.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties Sat Aug 14 18:00:36 2010
@@ -946,8 +946,7 @@ XCL12.S=\u5C1D\u8BD5\u5C06\u7C7B\u578B\u
 XCL13.S=\u53C2\u6570\u4F4D\u7F6E\u201C{0}\u201D\u8D85\u51FA\u8303\u56F4\u3002\u6B64\u9884\u7F16\u8BD1\u8BED\u53E5\u7684\u53C2\u6570\u6570\u76EE\u4E3A\u201C{1}\u201D\u3002
 XCL14.S=\u5217\u4F4D\u7F6E\u201C{0}\u201D\u8D85\u51FA\u8303\u56F4\u3002\u6B64 ResultSet \u7684\u5217\u6570\u4E3A\u201C{1}\u201D\u3002
 XCL15.S=\u5F53\u5728\u5BF9\u8C61\u201C{0}\u201D\u4E0A\u8C03\u7528 compareTo() \u65B9\u6CD5\u65F6\uFF0C\u53D1\u751F ClassCastException\u3002compareTo() \u7684\u53C2\u6570\u5C5E\u4E8E\u7C7B\u201C{1}\u201D\u3002
-XCL16.S.0=ResultSet \u672A\u6253\u5F00\u3002\u4E0D\u5141\u8BB8\u64CD\u4F5C\u201C{0}\u201D\u3002\u9A8C\u8BC1\u81EA\u52A8\u843D\u5B9E\u662F\u5426\u5DF2\u5173\u95ED\u3002
-XCL16.S.1=ResultSet \u672A\u6253\u5F00\u3002\u9A8C\u8BC1\u81EA\u52A8\u843D\u5B9E\u662F\u5426\u5DF2\u5173\u95ED\u3002
+XCL16.S=ResultSet \u672A\u6253\u5F00\u3002\u4E0D\u5141\u8BB8\u64CD\u4F5C\u201C{0}\u201D\u3002\u9A8C\u8BC1\u81EA\u52A8\u843D\u5B9E\u662F\u5426\u5DF2\u5173\u95ED\u3002
 XCL18.S=\u4E0D\u80FD\u591A\u6B21\u68C0\u7D22\u6D41\u6216 LOB \u503C
 XCL19.S=\u5173\u952E\u5B57\u201C{1}\u201D\u7684\u8868\u201C{0}\u201D\u7F3A\u5C11\u884C\u3002
 XCL20.S=\u7248\u672C\u7EA7\u522B\u201C{0}\u201D\u4E0A\u7684\u76EE\u5F55\u65E0\u6CD5\u5347\u7EA7\u4E3A\u7248\u672C\u7EA7\u522B\u201C{1}\u201D\u3002

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties Sat Aug 14 18:00:36 2010
@@ -948,8 +948,7 @@ XCL12.S=\u8A66\u5716\u5C07\u985E\u578B '
 XCL13.S=\u53C3\u6578\u4F4D\u7F6E ''{0}'' \u8D85\u51FA\u7BC4\u570D\u3002\u6B64\u5099\u59A5\u9673\u8FF0\u5F0F\u7684\u53C3\u6578\u6578\u76EE\u662F ''{1}''\u3002
 XCL14.S=\u76F4\u6B04\u4F4D\u7F6E ''{0}'' \u8D85\u51FA\u7BC4\u570D\u3002\u6B64 ResultSet \u7684\u76F4\u6B04\u6578\u76EE\u662F ''{1}''\u3002
 XCL15.S=\u547C\u53EB\u7269\u4EF6 ''{0}'' \u4E0A\u7684 compareTo() \u65B9\u6CD5\u6642\uFF0C\u767C\u751F ClassCastException\u3002compareTo() \u4E4B\u53C3\u6578\u7684\u985E\u5225\u662F ''{1}''\u3002
-XCL16.S.0=\u672A\u958B\u555F ResultSet\u3002\u4E0D\u5141\u8A31\u57F7\u884C\u4F5C\u696D ''{0}''\u3002\u8ACB\u78BA\u8A8D\u81EA\u52D5\u78BA\u5B9A\u662F OFF\u3002
-XCL16.S.1=\u672A\u958B\u555F ResultSet\u3002\u8ACB\u78BA\u8A8D\u81EA\u52D5\u78BA\u5B9A\u662F OFF\u3002
+XCL16.S=\u672A\u958B\u555F ResultSet\u3002\u4E0D\u5141\u8A31\u57F7\u884C\u4F5C\u696D ''{0}''\u3002\u8ACB\u78BA\u8A8D\u81EA\u52D5\u78BA\u5B9A\u662F OFF\u3002
 XCL18.S=\u4E0D\u80FD\u591A\u6B21\u64F7\u53D6\u4E32\u6D41\u6216 LOB \u503C
 XCL19.S=\u907A\u6F0F\u7D22\u5F15\u9375 ''{1}'' \u4E4B\u8868\u683C ''{0}'' \u4E2D\u7684\u5217\u3002
 XCL20.S=\u7121\u6CD5\u5C07\u7248\u672C\u5C64\u6B21 ''{0}'' \u7684\u578B\u9304\u5347\u7D1A\u6210\u7248\u672C\u5C64\u6B21 ''{1}''\u3002

Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java (original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java Sat Aug 14 18:00:36 2010
@@ -1382,8 +1382,7 @@ public interface SQLState {
 	String LANG_INVALID_PARAM_POSITION                                 = "XCL13.S";
 	String LANG_INVALID_COLUMN_POSITION                                 = "XCL14.S";
 	String LANG_INVALID_COMPARE_TO                                     = "XCL15.S";
-	String LANG_RESULT_SET_NOT_OPEN                                    = "XCL16.S.0";
-    String CLIENT_RESULT_SET_NOT_OPEN                                  = "XCL16.S.1";
+	String LANG_RESULT_SET_NOT_OPEN                                    = "XCL16.S";
     String LANG_STREAM_RETRIEVED_ALREADY = "XCL18.S";
 	String LANG_MISSING_ROW                                            = "XCL19.S";
 	String LANG_CANT_UPGRADE_CATALOGS                                  = "XCL20.S";

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out Sat Aug 14 18:00:36 2010
@@ -48,9 +48,9 @@ commit;
 ij> -- now try the fetch on cursors again after commit
 ----- cursors jdk1 and jdk2 will give errors
 next jdk1;
-ERROR XCL16: ResultSet not open.  Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> next jdk2;
-ERROR XCL16: ResultSet not open.  Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> next jdk4;
 C11 |C12        
 -----
@@ -88,11 +88,11 @@ rollback;
 ij> -- now try the fetch on cursors again after rollback
 ----- all the cursors will give errors
 next jdk1;
-ERROR XCL16: ResultSet not open.  Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> next jdk2;
-ERROR XCL16: ResultSet not open.  Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> next jdk4;
-ERROR XCL16: ResultSet not open.  Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> -- clean up.
 close jdk1;
 ij> close jdk2;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java Sat Aug 14 18:00:36 2010
@@ -1487,6 +1487,8 @@ public class ResultSetTest
             fail("getHoldability() should fail when closed");
         } catch (SQLException sqle) {
             assertSQLState("XCL16", sqle);
+            // DERBY-4767, sample verification test for operation in XCL16 message.
+            assertTrue(sqle.getMessage().indexOf("getHoldability") > 0);
         }
         
         // test explicitly set holdability

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java Sat Aug 14 18:00:36 2010
@@ -531,6 +531,8 @@ public class TestDbMetaData extends Base
                 // OK, didn't fail, ResultSet wasn't closed
             } catch (SQLException sqle) {
                 assertSQLState("XCL16", sqle);
+                // DERBY-4767, sample verification test for operation in XCL16 message.
+                assertTrue(sqle.getMessage().indexOf("next") > 0);
                 // OK, ResultSet is closed, increase counter
                 closedResultSets++;
             }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java Sat Aug 14 18:00:36 2010
@@ -634,6 +634,8 @@ public class ResultSetMiscTest extends B
             fail("FAIL Error should have occured with rs.next() on a closed ResultSet");
         } catch (SQLException se) {
             assertEquals("XCL16", se.getSQLState());
+            // DERBY-4767, sample verification test for operation in XCL16 message.
+            assertTrue(se.getMessage().indexOf("next") > 0);
         }
     }
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java?rev=985550&r1=985549&r2=985550&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java Sat Aug 14 18:00:36 2010
@@ -567,6 +567,8 @@ public class UpdatableResultSetTest  ext
                     "result set is closed");
         } catch (SQLException e) {
             assertSQLState("XCL16", e);
+            // DERBY-4767, sample verification test for operation in XCL16 message.
+            assertTrue(e.getMessage().indexOf("deleteRow") > 0);
         }
         
         // attempt to send a deleteRow on a closed result set
@@ -576,6 +578,8 @@ public class UpdatableResultSetTest  ext
                     "result set is closed");
         } catch (SQLException e) {
             assertSQLState("XCL16", e);
+            // DERBY-4767, sample verification test for operation in XCL16 message.
+            assertTrue(e.getMessage().indexOf("updateRow") > 0);
         }
         rs.close();
         
@@ -3845,6 +3849,8 @@ public class UpdatableResultSetTest  ext
                     "after commit");
         } catch (SQLException se) {
             assertSQLState("XCL16", se);
+            // DERBY-4767, sample verification test for operation in XCL16 message.
+            assertTrue(se.getMessage().indexOf("insertRow") > 0);
         }
         rs.close();
         



Mime
View raw message