db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r1155332 - in /db/derby/code/trunk/java: client/org/apache/derby/client/am/ engine/org/apache/derby/iapi/services/io/ engine/org/apache/derby/impl/jdbc/ engine/org/apache/derby/loc/ shared/org/apache/derby/shared/common/reference/
Date Tue, 09 Aug 2011 12:23:04 GMT
Author: kristwaa
Date: Tue Aug  9 12:23:03 2011
New Revision: 1155332

URL: http://svn.apache.org/viewvc?rev=1155332&view=rev
Log:
DERBY-5090: Retrieving BLOB fields sometimes fails 

Clean up use of messages when accessing closed objects (mostly streams):
 o remove unused XJ094.S
 o rename J104 to OBJECT_CLOSED.
 o replace uses of XCL53 with J104.
 o remove XCL53

Patch file: derby-5090-3a-change_messages.diff


Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBInputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBOutputStream.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/MessageId.java
    db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java?rev=1155332&r1=1155331&r2=1155332&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java
(original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java
Tue Aug  9 12:23:03 2011
@@ -31,7 +31,7 @@ class CloseFilterInputStream extends Fil
 	
 	private static final String ALREADY_CLOSED_ERR_MESSAGE = 
             SqlException.getMessageUtil().getTextMessage(
-                MessageId.CONN_ALREADY_CLOSED);
+                MessageId.OBJECT_CLOSED);
 	
 	private boolean closed;
 	

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java?rev=1155332&r1=1155331&r2=1155332&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java
Tue Aug  9 12:23:03 2011
@@ -36,7 +36,7 @@ public class CloseFilterInputStream
 
     /** Message, modeled after CloseFilterInputStream in the client. */
     private static final String MESSAGE =
-            MessageService.getTextMessage(MessageId.CONN_ALREADY_CLOSED); 
+            MessageService.getTextMessage(MessageId.OBJECT_CLOSED); 
     
     /** Tells if this stream has been closed. */
     private boolean closed;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java?rev=1155332&r1=1155331&r2=1155332&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java Tue Aug
 9 12:23:03 2011
@@ -23,12 +23,9 @@
 package org.apache.derby.impl.jdbc;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.io.Writer;
 import java.sql.SQLException;
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.SQLState;
+import org.apache.derby.iapi.reference.MessageId;
 import org.apache.derby.iapi.services.i18n.MessageService;
 
 /**
@@ -67,7 +64,7 @@ final class ClobUtf8Writer extends Write
     public void flush() throws IOException {
         if (closed)
             throw new IOException (
-                MessageService.getTextMessage (SQLState.LANG_STREAM_CLOSED));
+                MessageService.getTextMessage(MessageId.OBJECT_CLOSED));
         // A no-op.
         // Flushing is currently the responsibility of the underlying stream(s).
     }
@@ -95,7 +92,7 @@ final class ClobUtf8Writer extends Write
     public void write(char[] cbuf, int off, int len) throws IOException {
         if (closed)
             throw new IOException (
-                MessageService.getTextMessage (SQLState.LANG_STREAM_CLOSED));
+                MessageService.getTextMessage(MessageId.OBJECT_CLOSED));
         try {
             long ret = control.insertString (String.copyValueOf (
                                                     cbuf, off, len), 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBInputStream.java?rev=1155332&r1=1155331&r2=1155332&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBInputStream.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBInputStream.java Tue Aug
 9 12:23:03 2011
@@ -26,6 +26,7 @@ import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.iapi.reference.MessageId;
 import org.apache.derby.iapi.reference.SQLState;
 import org.apache.derby.iapi.services.i18n.MessageService;
 import org.apache.derby.iapi.services.sanity.SanityManager;
@@ -119,7 +120,7 @@ public class LOBInputStream
     public int read(byte[] b, int off, int len) throws IOException {
         if (closed)
             throw new IOException (
-                   MessageService.getTextMessage(SQLState.LANG_STREAM_CLOSED));
+                   MessageService.getTextMessage(MessageId.OBJECT_CLOSED));
         try {
             int ret = control.read(b, off, len, pos);
             if (ret != -1) {
@@ -171,7 +172,7 @@ public class LOBInputStream
     public int read() throws IOException {
         if (closed)
             throw new IOException (
-                   MessageService.getTextMessage (SQLState.LANG_STREAM_CLOSED));
+                   MessageService.getTextMessage(MessageId.OBJECT_CLOSED));
         try {
             int ret = control.read(pos);
             if (ret != -1)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBOutputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBOutputStream.java?rev=1155332&r1=1155331&r2=1155332&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBOutputStream.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBOutputStream.java Tue Aug
 9 12:23:03 2011
@@ -25,6 +25,7 @@ package org.apache.derby.impl.jdbc;
 import java.io.IOException;
 import java.io.OutputStream;
 import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.iapi.reference.MessageId;
 import org.apache.derby.iapi.reference.SQLState;
 import org.apache.derby.iapi.services.i18n.MessageService;
 import org.apache.derby.iapi.error.ExceptionUtil;
@@ -63,8 +64,7 @@ public class LOBOutputStream extends Out
     public void write(int b) throws IOException {
         if (closed)
             throw new IOException (
-                    MessageService.getTextMessage(
-                        SQLState.LANG_STREAM_CLOSED));
+                    MessageService.getTextMessage(MessageId.OBJECT_CLOSED));
         try {
             pos = control.write(b, pos);
         } catch (StandardException se) {
@@ -103,8 +103,7 @@ public class LOBOutputStream extends Out
     public void write(byte[] b, int off, int len) throws IOException {
         if (closed)
             throw new IOException (
-                    MessageService.getTextMessage(
-                        SQLState.LANG_STREAM_CLOSED));
+                    MessageService.getTextMessage(MessageId.OBJECT_CLOSED));
         try {
             pos = control.write(b, off, len, pos);
         } catch (StandardException se) {

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=1155332&r1=1155331&r2=1155332&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 Tue Aug  9 12:23:03
2011
@@ -16,7 +16,7 @@ distributed under the License is distrib
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
 See the License for the specific language governing permissions and  
 limitations under the License.
--->
+--> 
 
 
 <!-- 
@@ -4102,11 +4102,6 @@ ln=lower-case two-letter ISO-639 languag
                 <text>The statement has been cancelled or timed out.</text>
             </msg>
 
-            <msg>
-                <name>XCL53</name>
-                <text>Stream is closed</text>
-            </msg>
-
         </family>
 
 
@@ -4706,11 +4701,6 @@ ln=lower-case two-letter ISO-639 languag
             </msg>
 
             <msg>
-                <name>XJ094.S</name>
-                <text>This object is already closed.</text>
-            </msg>
-
-            <msg>
                 <name>XJ095.S</name>
                 <text>An attempt to execute a privileged action failed.</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=1155332&r1=1155331&r2=1155332&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 Tue Aug  9
12:23:03 2011
@@ -1224,7 +1224,6 @@ XJ088.S=Neplatn\u00e1 operace: bylo vol\
 XJ090.S=Neplatn\u00fd parametr: kalend\u00e1\u0159 m\u00e1 hodnotu ''null''.
 XJ091.S=Neplatn\u00fd argument: index parametru {0} nen\u00ed parametrem OUT nebo INOUT.
 XJ093.S=D\u00e9lka BLOB/CLOB {0} je p\u0159\u00edli\u0161 velk\u00e1. D\u00e9lka nem\u016f\u017ee
p\u0159ekro\u010dit {1}.
-XJ094.S=Tento objekt je ji\u017e zav\u0159en.
 XJ095.S=Selh\u00e1n\u00ed pokusu o proveden\u00ed p\u0159ednostn\u00ed akce.
 XJ096.S=Bal\u00edk prost\u0159edk\u016f nebyl nalezen v bal\u00edku {0} pro {1}
 XJ097.S=Nelze rolovat zp\u011bt nebo uvolnit bod ulo\u017een\u00ed, kter\u00fd nebyl vytvo\u0159en
t\u00edmto spojen\u00edm.

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=1155332&r1=1155331&r2=1155332&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 Tue Aug
 9 12:23:03 2011
@@ -987,7 +987,6 @@ XCL49.S=F\u00FCr ''{0}'' ist TRUNCATE TA
 XCL50.S=Ein Upgrade f\u00FCr eine fr\u00FChere Version der Datenbank wird nicht unterst\u00FCtzt.
Die Datenbank, auf die zugegriffen wird, hat den Versionsstand ''{0}'' und diese Software
den Versionsstand ''{1}''. 
 XCL51.S=Die angeforderte Funktion kann keine Tabellen im Schema SESSION referenzieren.
 XCL52.S=Die Anweisung wurde abgebrochen, oder das Zeitlimit f\u00FCr die Anweisung wurde
\u00FCberschritten.
-XCL53=Datenstrom wurde geschlossen
 XCW00.D=Ein Upgrade von ''{0}'' auf ''{1}'' wird nicht unterst\u00FCtzt.
 XCXA0.S=Ung\u00FCltige Kennung.
 XCXB0.S=Ung\u00FCltiger Datenbankklassenpfad\: ''{0}''.
@@ -1090,7 +1089,6 @@ XJ088.S=Ung\u00FCltige Operation\: wasNu
 XJ090.S=Ung\u00FCltiger Parameter\: calendar ist null.
 XJ091.S=Ung\u00FCltiges Argument\: Der Parameterindex {0} ist kein OUT- oder INOUT-Parameter.
 XJ093.S=Das BLOB/CLOB {0} ist zu lang. Die L\u00E4nge darf {1} nicht \u00FCberschreiten.
-XJ094.S=Dieses Objekt ist bereits geschlossen.
 XJ095.S=Der Versuch, eine Aktion mit erforderlicher Berechtigung auszuf\u00FChren, ist gescheitert.
 XJ096.S=Im Paket {0} f\u00FCr {1} konnte ein Ressourcen-Bundle nicht gefunden werden.
 XJ097.S=Ein Sicherungspunkt, der nicht von dieser Verbindung erstellt wurde, kann nicht zur\u00FCckgesetzt
oder freigegeben 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=1155332&r1=1155331&r2=1155332&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 Tue Aug  9
12:23:03 2011
@@ -987,7 +987,6 @@ XCL49.S=No se permite TRUNCATE TABLE en 
 XCL50.S=No se ha soporte a una actualizaci\u00F3n de base de datos de una versi\u00F3n anterior.
 La base de datos a la que se accede est\u00E1 al nivel de versi\u00F3n ''{0}'', este software
est\u00E1 al nivel de versi\u00F3n ''{1}''.    
 XCL51.S=La funci\u00F3n solicitada no puede hacer referencia a tablas en el esquema SESSION.
 XCL52.S=La sentencia se ha cancelado o ha excedido el tiempo de espera.
-XCL53=La secuencia se ha cerrado.
 XCW00.D=Actualizaci\u00F3n no soportada de ''{0}'' a ''{1}''.
 XCXA0.S=Identificador no v\u00E1lido.
 XCXB0.S=Classpath de base de datos no v\u00E1lida\: ''{0}''.
@@ -1090,7 +1089,6 @@ XJ088.S=Operaci\u00F3n no v\u00E1lida\: 
 XJ090.S=Par\u00E1metro no v\u00E1lido\: el calendario es nulo.
 XJ091.S=Argumento no v\u00E1lido\: el \u00EDndice de par\u00E1metro {0} no es un par\u00E1metro
OUT o INOUT.
 XJ093.S=La longitud de BLOB/CLOB, {0}, es demasiado grande.  La longitud no puede exceder
de {1}.
-XJ094.S=Este objeto ya est\u00E1 cerrado.
 XJ095.S=Ha fallado un intento de ejecutar una acci\u00F3n privilegiada.
 XJ096.S=No se ha encontrado un paquete de recursos en el paquete {0} para {1}
 XJ097.S=No se puede retrotraer o liberar un SAVEPOINT que no haya sido creado por esta conexi\u00F3n.

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=1155332&r1=1155331&r2=1155332&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 Tue Aug  9
12:23:03 2011
@@ -987,7 +987,6 @@ XCL49.S=L''instruction TRUNCATE TABLE n'
 XCL50.S=La mise \u00E0 niveau de la base de donn\u00E9es \u00E0 partir d''une version ant\u00E9rieure
n''est pas prise en charge.  Le niveau de version de la base de donn\u00E9es est ''{0}'' et
celui du logiciel est ''{1}''.    
 XCL51.S=La fonction demand\u00E9e ne peut pas faire r\u00E9f\u00E9rence \u00E0 des tables
du sch\u00E9ma SESSION.
 XCL52.S=Cette instruction a \u00E9t\u00E9 annul\u00E9e ou interrompue.
-XCL53=Flux ferm\u00E9
 XCW00.D=Mise \u00E0 niveau de ''{0}'' vers ''{1}'' non prise en charge.
 XCXA0.S=Identificateur non valide.
 XCXB0.S=Chemin d''acc\u00E8s aux classes de base de donn\u00E9es non valide \: ''{0}''.
@@ -1090,7 +1089,6 @@ XJ088.S=Op\u00E9ration incorrecte \: m\u
 XJ090.S=Param\u00E8tre incorrect \: l''agenda est null.
 XJ091.S=Argument incorrect \: l''index de param\u00E8tre {0} n''est pas un param\u00E8tre
OUT ou INOUT.
 XJ093.S=La longueur de BLOB/CLOB, {0}, est trop importante.  La longueur ne peut d\u00E9passer
{1}.
-XJ094.S=Cet objet est d\u00E9j\u00E0 ferm\u00E9.
 XJ095.S=Une tentative d''ex\u00E9cution d''une action privil\u00E9gi\u00E9e a \u00E9chou\u00E9.
 XJ096.S=Aucun regroupement de ressources n''a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le module
{0} pour {1}
 XJ097.S=Impossible d''annuler ou d''\u00E9diter un point de sauvegarde qui n''a pas \u00E9t\u00E9
cr\u00E9\u00E9 par cette connexion.

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=1155332&r1=1155331&r2=1155332&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 Tue Aug  9
12:23:03 2011
@@ -1224,7 +1224,6 @@ XJ088.S=\u00c9rv\u00e9nytelen m\u0171vel
 XJ090.S=\u00c9rv\u00e9nytelen param\u00e9ter: a napt\u00e1r null\u00e9rt\u00e9k\u0171.
 XJ091.S=\u00c9rv\u00e9nytelen argumentum: a(z) {0} param\u00e9terindex nem kimen\u0151 (OUT)
vagy bej\u00f6v\u0151 (INOUT) param\u00e9ter.
 XJ093.S=A BLOB/CLOB hossza ({0}) t\u00fal nagy.  A hossz maximum {1} lehet.
-XJ094.S=Az objektum m\u00e1r be lett z\u00e1rva.
 XJ095.S=A privilegiz\u00e1lt tev\u00e9kenys\u00e9g v\u00e9grehajt\u00e1s\u00e1ra t\u00f6rt\u00e9nt
k\u00eds\u00e9rlet meghi\u00fasult.
 XJ096.S=A(z) {0} csomagban a(z) {1} elemhez nem tal\u00e1lhat\u00f3 er\u0151forr\u00e1sk\u00f6teg
 XJ097.S=A kapcsolat \u00e1ltal l\u00e9trehozott ment\u00e9si pont nem g\u00f6rgethet\u0151
vissza vagy szabad\u00edthat\u00f3 fel.

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=1155332&r1=1155331&r2=1155332&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 Tue Aug  9
12:23:03 2011
@@ -987,7 +987,6 @@ XCL49.S=TRUNCATE TABLE non \u00E8 consen
 XCL50.S=L''aggiornamento del database da una versione precedente non \u00E8 supportato. 
Il  database a cui si accede \u00E8 al livello della versione ''{0}'', il software \u00E8
al livello della versione ''{1}''.    
 XCL51.S=La funzione richiesta non pu\u00F2 fare riferimento alle tabelle nello schema SESSION.
 XCL52.S=L''istruzione \u00E8 stata cancellata o si \u00E8 verificato il timeout.
-XCL53=Il flusso \u00E8 chiuso
 XCW00.D=Impossibile eseguire l''aggiornamento da ''{0}'' a ''{1}''.
 XCXA0.S=Identificatore non valido.
 XCXB0.S=Percorso classe database non valido\: ''{0}''.
@@ -1090,7 +1089,6 @@ XJ088.S=Operazione non valida\: wasNull(
 XJ090.S=Parametro non valido\: il calendario \u00E8 nullo.
 XJ091.S=Argomento non valido\: l''indice del parametro {0} non \u00E8 un parametro OUT o
INOUT.
 XJ093.S=La lunghezza di BLOB/CLOB, {0}, \u00E8 di dimensioni troppo elevate.  Non pu\u00F2
superare {1}.
-XJ094.S=Questo oggetto \u00E8 gi\u00E0 chiuso.
 XJ095.S=Tentativo di eseguire un''azione privilegiata non riuscito.
 XJ096.S=Non \u00E8 stato possibile trovare il bundle della risorsa nel pacchetto {0} per
{1}
 XJ097.S=Impossibile eseguire il rollback o il rilascio di un savepoint creato da questa connessione.

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=1155332&r1=1155331&r2=1155332&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 Tue Aug
 9 12:23:03 2011
@@ -985,7 +985,6 @@ XCL49.S=''{0}'' \u306F\u4F7F\u7528\u53EF
 XCL50.S=\u524D\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u304B\u3089\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3002
 \u30A2\u30AF\u30BB\u30B9\u3057\u3066\u3044\u308B\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u30FB\u30EC\u30D9\u30EB\u306F
''{0}'' \u3067\u3001\u3053\u306E\u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u30FB\u30EC\u30D9\u30EB\u306F
''{1}'' \u3067\u3059\u3002    
 XCL51.S=\u8981\u6C42\u3055\u308C\u305F\u6A5F\u80FD\u306F\u3001SESSION \u30B9\u30AD\u30FC\u30DE\u306E\u8868\u3092\u53C2\u7167\u3067\u304D\u307E\u305B\u3093\u3002
 XCL52.S=\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u306F\u53D6\u308A\u6D88\u3055\u308C\u305F\u304B\u3001\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u306B\u306A\u308A\u307E\u3057\u305F\u3002
-XCL53=\u30B9\u30C8\u30EA\u30FC\u30E0\u304C\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u3059
 XCW00.D=''{0}'' \u304B\u3089 ''{1}'' \u3078\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 XCXA0.S=\u7121\u52B9\u306A ID\u3002
 XCXB0.S=\u7121\u52B9\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30AF\u30E9\u30B9\u30D1\u30B9\:
''{0}''\u3002
@@ -1088,7 +1087,6 @@ XJ088.S=\u7121\u52B9\u306A\u30AA\u30DA\u
 XJ090.S=\u7121\u52B9\u306A\u30D1\u30E9\u30E1\u30FC\u30BF\: \u30AB\u30EC\u30F3\u30C0\u304C
NULL \u3067\u3059\u3002
 XJ091.S=\u7121\u52B9\u306A\u5F15\u6570\: \u30D1\u30E9\u30E1\u30FC\u30BF\u7D22\u5F15 {0} \u306F
OUT \u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u3082 INOUT \u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u3082\u3042\u308A\u307E\u305B\u3093\u3002
 XJ093.S=BLOB/CLOB \u306E\u9577\u3055 {0} \u304C\u9577\u3059\u304E\u307E\u3059\u3002  \u9577\u3055\u304C
{1} \u3092\u8D85\u3048\u3066\u306F\u306A\u308A\u307E\u305B\u3093\u3002
-XJ094.S=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u65E2\u306B\u30AF\u30ED\u30FC\u30BA\u3055\u308C\u3066\u3044\u307E\u3059\u3002
 XJ095.S=\u7279\u6A29\u30A2\u30AF\u30B7\u30E7\u30F3\u3092\u5B9F\u884C\u3057\u3088\u3046\u3068\u3057\u3066\u5931\u6557\u3057\u307E\u3057\u305F\u3002
 XJ096.S=\u30EA\u30BD\u30FC\u30B9\u30FB\u30D0\u30F3\u30C9\u30EB\u3092 {1} \u306E {0} \u30D1\u30C3\u30B1\u30FC\u30B8\u304B\u3089\u691C\u51FA\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 XJ097.S=\u3053\u306E\u63A5\u7D9A\u3067\u4F5C\u6210\u3055\u308C\u3066\u3044\u306A\u3044\u30BB\u30FC\u30D6\u30DD\u30A4\u30F3\u30C8\u306E\u30ED\u30FC\u30EB\u30D0\u30C3\u30AF\u307E\u305F\u306F\u30EA\u30EA\u30FC\u30B9\u3092\u884C\u3046\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=1155332&r1=1155331&r2=1155332&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 Tue Aug
 9 12:23:03 2011
@@ -988,7 +988,6 @@ XCL49.S=TRUNCATE TABLE\uC740 \uC0AC\uC6A
 XCL50.S=\uC774\uC804 \uBC84\uC804\uC5D0\uC11C \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB97C
\uC5C5\uADF8\uB808\uC774\uB4DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC561\uC138\uC2A4 \uC911\uC778
\uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB294 \uBC84\uC804 \uB808\uBCA8 ''{0}''\uC5D0 \uC788\uC73C\uBA70
\uC774 \uC18C\uD504\uD2B8\uC6E8\uC5B4\uB294 \uBC84\uC804 \uB808\uBCA8 ''{1}''\uC5D0 \uC788\uC2B5\uB2C8\uB2E4.

 XCL51.S=\uC694\uCCAD \uD568\uC218\uAC00 SESSION \uC2A4\uD0A4\uB9C8\uC758 \uD14C\uC774\uBE14\uC744
\uCC38\uC870\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 XCL52.S=\uBA85\uB839\uBB38\uC774 \uCDE8\uC18C\uB418\uC5C8\uAC70\uB098 \uC2DC\uAC04\uC885\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-XCL53=\uC2A4\uD2B8\uB9BC\uC774 \uB2EB\uD614\uC2B5\uB2C8\uB2E4.
 XCW00.D=''{0}''\uC5D0\uC11C ''{1}''(\uC73C)\uB85C\uC758 \uC5C5\uADF8\uB808\uC774\uB4DC\uAC00
\uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 XCXA0.S=\uC720\uD6A8\uD558\uC9C0 \uC54A\uC740 ID.
 XCXB0.S=\uC720\uD6A8\uD558\uC9C0 \uC54A\uC740 \uB370\uC774\uD130\uBCA0\uC774\uC2A4 \uD074\uB798\uC2A4
\uACBD\uB85C\: ''{0}''.
@@ -1091,7 +1090,6 @@ XJ088.S=\uC720\uD6A8\uD558\uC9C0 \uC54A\
 XJ090.S=\uC720\uD6A8\uD558\uC9C0 \uC54A\uC740 \uB9E4\uAC1C\uBCC0\uC218\: \uB2EC\uB825\uC774
NULL\uC785\uB2C8\uB2E4.
 XJ091.S=\uC720\uD6A8\uD558\uC9C0 \uC54A\uC740 \uC778\uC218\: \uB9E4\uAC1C\uBCC0\uC218 \uC0C9\uC778
{0}\uC774(\uAC00) OUT \uB610\uB294 INOUT \uB9E4\uAC1C\uBCC0\uC218\uAC00 \uC544\uB2D9\uB2C8\uB2E4.
 XJ093.S=BLOB/CLOB\uC758 \uAE38\uC774({0})\uAC00 \uB108\uBB34 \uD07D\uB2C8\uB2E4. \uAE38\uC774\uB294
{1}\uC744(\uB97C) \uCD08\uACFC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-XJ094.S=\uC774 \uC624\uBE0C\uC81D\uD2B8\uAC00 \uC774\uBBF8 \uB2EB\uD614\uC2B5\uB2C8\uB2E4.
 XJ095.S=\uAD8C\uD55C \uC788\uB294 \uC870\uCE58\uB97C \uC2E4\uD589\uD558\uB824\uB294 \uC2DC\uB3C4\uAC00
\uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
 XJ096.S={1}\uC5D0 \uB300\uD55C {0} \uD328\uD0A4\uC9C0\uC5D0\uC11C \uC790\uC6D0 \uBC88\uB4E4\uC744
\uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 XJ097.S=\uC774 \uC5F0\uACB0\uC5D0 \uC758\uD574 \uB9CC\uB4E4\uC5B4\uC9C0\uC9C0 \uC54A\uC740
\uC138\uC774\uBE0C\uD3EC\uC778\uD2B8\uB97C \uB864\uBC31 \uB610\uB294 \uB9B4\uB9AC\uC2A4\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=1155332&r1=1155331&r2=1155332&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 Tue Aug  9
12:23:03 2011
@@ -1224,7 +1224,6 @@ XJ088.S=Niepoprawna operacja: funkcja wa
 XJ090.S=Niepoprawny parametr: kalendarz ma warto\u015b\u0107 null.
 XJ091.S=Niepoprawny argument: indeks parametru {0} nie jest parametrem OUT lub INOUT.
 XJ093.S=D\u0142ugo\u015b\u0107 wzorca BLOB/CLOB, {0}, jest za du\u017ca. D\u0142ugo\u015b\u0107
nie mo\u017ce przekracza\u0107 {1}.
-XJ094.S=Ten obiekt jest ju\u017c zamkni\u0119ty.
 XJ095.S=Pr\u00f3ba wykonania uprawnionego dzia\u0142ania nie powiod\u0142a si\u0119.
 XJ096.S=W pakiecie {0} dla {1} nie mo\u017cna znale\u017a\u0107 pakunku zasobu
 XJ097.S=Nie mo\u017cna wycofa\u0107 lub zwolni\u0107 punktu zapisu, kt\u00f3ry nie zosta\u0142
utworzony przez to po\u0142\u0105czenie.

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=1155332&r1=1155331&r2=1155332&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 Tue Aug
 9 12:23:03 2011
@@ -1219,7 +1219,6 @@ XJ088.S=Opera\u00e7\u00e3o inv\u00e1lida
 XJ090.S=Par\u00e2metro inv\u00e1lido: o calend\u00e1rio \u00e9 nulo.
 XJ091.S=Argumento inv\u00e1lido: o \u00edndice do par\u00e2metro {0} n\u00e3o \u00e9 um par\u00e2metro
OUT ou INOUT.
 XJ093.S=O comprimento do BLOB/CLOB, {0}, \u00e9 muito grande.  O comprimento n\u00e3o pode
exceder {1}.
-XJ094.S=Este objeto j\u00e1 se encontra fechado.
 XJ095.S=Falha na tentativa de executar uma a\u00e7\u00e3o privilegiada.
 XJ096.S=N\u00e3o foi poss\u00edvel encontrar um pacote de recursos no {0} pacote para {1}
 XJ097.S=N\u00e3o \u00e9 poss\u00edvel desfazer ou liberar um ponto de salvamento que n\u00e3o
foi criado por esta conex\u00e3o.

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=1155332&r1=1155331&r2=1155332&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 Tue Aug  9
12:23:03 2011
@@ -1224,7 +1224,6 @@ XJ088.S=\u041d\u0435\u0434\u043e\u043f\u
 XJ090.S=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440:
\u043d\u0443\u043b\u0435\u0432\u043e\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c.
 XJ091.S=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0430\u0440\u0433\u0443\u043c\u0435\u043d\u0442:
\u0438\u043d\u0434\u0435\u043a\u0441 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430
{0} \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u043c
OUT \u0438\u043b\u0438 INOUT.
 XJ093.S=\u0414\u043b\u0438\u043d\u0430 \u043e\u0431\u044a\u0435\u043a\u0442\u0430 BLOB/CLOB,
{0}, \u0441\u043b\u0438\u0448\u043a\u043e\u043c \u0432\u0435\u043b\u0438\u043a\u0430.  \u0414\u043b\u0438\u043d\u0430
\u043d\u0435 \u0434\u043e\u043b\u0436\u043d\u0430 \u043f\u0440\u0435\u0432\u044b\u0448\u0430\u0442\u044c
{1}.
-XJ094.S=\u042d\u0442\u043e\u0442 \u043e\u0431\u044a\u0435\u043a\u0442 \u0443\u0436\u0435
\u0437\u0430\u043a\u0440\u044b\u0442.
 XJ095.S=\u041f\u043e\u043f\u044b\u0442\u043a\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c
\u043f\u0440\u0438\u0432\u0438\u043b\u0435\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u043e\u0435
\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043b\u0430\u0441\u044c
\u043d\u0435\u0443\u0434\u0430\u0447\u043d\u043e.
 XJ096.S=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438
\u043a\u043e\u043c\u043f\u043b\u0435\u043a\u0442 \u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432
\u0432 \u043f\u0430\u043a\u0435\u0442\u0435 {0} \u0434\u043b\u044f {1}
 XJ097.S=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438
\u043e\u0442\u043a\u0430\u0442 \u0438\u043b\u0438 \u0432\u044b\u0441\u0432\u043e\u0431\u043e\u0436\u0434\u0435\u043d\u0438\u0435
\u0442\u043e\u0447\u043a\u0438 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f,
\u043a\u043e\u0442\u043e\u0440\u0430\u044f \u043d\u0435 \u0431\u044b\u043b\u0430 \u0441\u043e\u0437\u0434\u0430\u043d\u0430
\u0434\u0430\u043d\u043d\u044b\u043c \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435\u043c.

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=1155332&r1=1155331&r2=1155332&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 Tue Aug
 9 12:23:03 2011
@@ -985,7 +985,6 @@ XCL49.S=\u201C{0}\u201D\u4E0A\u4E0D\u514
 XCL50.S=\u4E0D\u652F\u6301\u4ECE\u5148\u524D\u7248\u672C\u5347\u7EA7\u6570\u636E\u5E93\u3002\u6B63\u5728\u8BBF\u95EE\u7684\u6570\u636E\u5E93\u5904\u4E8E\u7248\u672C\u7EA7\u522B\u201C{0}\u201D\uFF0C\u6B64\u8F6F\u4EF6\u5904\u4E8E\u7248\u672C\u7EA7\u522B\u201C{1}\u201D\u3002
 XCL51.S=\u8BF7\u6C42\u7684\u51FD\u6570\u65E0\u6CD5\u5F15\u7528 SESSION \u6A21\u5F0F\u4E2D\u7684\u8868\u3002
 XCL52.S=\u8BED\u53E5\u5DF2\u53D6\u6D88\u6216\u8D85\u65F6\u3002
-XCL53=\u6D41\u5DF2\u5173\u95ED
 XCW00.D=\u4E0D\u652F\u6301\u4ECE\u201C{0}\u201D\u5347\u7EA7\u5230\u201C{1}\u201D\u3002
 XCXA0.S=\u6807\u8BC6\u65E0\u6548\u3002
 XCXB0.S=\u6570\u636E\u5E93\u7C7B\u8DEF\u5F84\u201C{0}\u201D\u65E0\u6548\u3002
@@ -1088,7 +1087,6 @@ XJ088.S=\u64CD\u4F5C\u65E0\u6548\uFF1A\u
 XJ090.S=\u53C2\u6570\u65E0\u6548\uFF1A\u65E5\u5386\u4E3A\u7A7A\u3002
 XJ091.S=\u81EA\u53D8\u91CF\u65E0\u6548\uFF1A\u53C2\u6570\u4E0B\u6807 {0} \u4E0D\u662F OUT
\u6216 INOUT \u53C2\u6570\u3002
 XJ093.S=BLOB/CLOB \u7684\u957F\u5EA6 {0} \u592A\u957F\u3002\u6B64\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7
{1}\u3002
-XJ094.S=\u6B64\u5BF9\u8C61\u5DF2\u5173\u95ED\u3002
 XJ095.S=\u5C1D\u8BD5\u6267\u884C\u7279\u6743\u64CD\u4F5C\u5931\u8D25\u3002
 XJ096.S=\u5728 {1} \u7684 {0} \u7A0B\u5E8F\u5305\u4E2D\u627E\u4E0D\u5230\u8D44\u6E90\u675F
 XJ097.S=\u65E0\u6CD5\u56DE\u6EDA\u6216\u91CA\u653E\u4E0D\u662F\u6B64\u8FDE\u63A5\u521B\u5EFA\u7684\u4FDD\u5B58\u70B9\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=1155332&r1=1155331&r2=1155332&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 Tue Aug
 9 12:23:03 2011
@@ -987,7 +987,6 @@ XCL49.S=\u5728 ''{0}'' \u4E0A\u4E0D\u514
 XCL50.S=\u4E0D\u652F\u63F4\u5F9E\u820A\u7248\u5347\u7D1A\u8CC7\u6599\u5EAB\u3002\u6B63\u5728\u5B58\u53D6\u4E4B\u8CC7\u6599\u5EAB\u7684\u7248\u672C\u5C64\u6B21\u70BA
''{0}''\uFF0C\u800C\u6B64\u8EDF\u9AD4\u7684\u7248\u672C\u5C64\u6B21\u70BA ''{1}''\u3002
 XCL51.S=\u6240\u8981\u6C42\u7684\u529F\u80FD\u4E0D\u80FD\u53C3\u7167 SESSION \u7DB1\u76EE\u4E2D\u7684\u8868\u683C\u3002
 XCL52.S=\u9673\u8FF0\u5F0F\u5DF2\u53D6\u6D88\u6216\u903E\u6642\u3002
-XCL53=\u4E32\u6D41\u5DF2\u95DC\u9589
 XCW00.D=\u4E0D\u652F\u63F4\u5F9E ''{0}'' \u5347\u7D1A\u81F3 ''{1}''\u3002
 XCXA0.S=\u8B58\u5225\u78BC\u7121\u6548\u3002
 XCXB0.S=\u7121\u6548\u7684\u8CC7\u6599\u5EAB\u985E\u5225\u8DEF\u5F91\uFF1A''{0}''\u3002
@@ -1090,7 +1089,6 @@ XJ088.S=\u4F5C\u696D\u7121\u6548\uFF1A\u
 XJ090.S=\u53C3\u6578\u7121\u6548\uFF1A\u884C\u4E8B\u66C6\u70BA\u7A7A\u503C\u3002
 XJ091.S=\u5F15\u6578\u7121\u6548\uFF1A\u53C3\u6578\u7D22\u5F15 {0} \u4E0D\u662F OUT \u6216
INOUT \u53C3\u6578\u3002
 XJ093.S=BLOB/CLOB \u7684\u9577\u5EA6 {0} \u592A\u5927\u3002\u9577\u5EA6\u4E0D\u53EF\u8D85\u51FA
{1}\u3002
-XJ094.S=\u6B64\u7269\u4EF6\u5DF2\u95DC\u9589\u3002
 XJ095.S=\u8A66\u5716\u57F7\u884C\u7279\u8A31\u52D5\u4F5C\u5931\u6557\u3002
 XJ096.S=\u5728 {1} \u7684 {0} \u8CC7\u6599\u5305\u4E2D\u627E\u4E0D\u5230\u8CC7\u6E90\u7D44\u3002
 XJ097.S=\u7121\u6CD5\u56DE\u5FA9\u6216\u91CB\u653E\u4E0D\u662F\u7531\u6B64\u9023\u7DDA\u6240\u5EFA\u7ACB\u7684\u5132\u5B58\u9EDE\u3002

Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java?rev=1155332&r1=1155331&r2=1155332&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java
(original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java
Tue Aug  9 12:23:03 2011
@@ -136,7 +136,7 @@ public interface MessageId {
     String CONN_NETWORK_SERVER_CLASS_LOAD   = "J101"; // Cannot load the network server constructor
     String CONN_NETWORK_SERVER_START_EXCEPTION = "J102";
     String CONN_NETWORK_SERVER_SHUTDOWN_EXCEPTION = "J103";
-    String CONN_ALREADY_CLOSED                              = "J104";
+    String OBJECT_CLOSED                                    = "J104";
     String CONN_PRECISION_TOO_LARGE                         = "J105";   
     //  following only used in text we print out - see client.am.SqlException:
     String BATCH_POSITION_ID                                = "J107";

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=1155332&r1=1155331&r2=1155332&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
Tue Aug  9 12:23:03 2011
@@ -1431,9 +1431,6 @@ public interface SQLState {
 
     String LANG_STATEMENT_CANCELLED_OR_TIMED_OUT                       = "XCL52.S";
 
-    //lob stream error
-    String LANG_STREAM_CLOSED                                     = "XCL53";
-
     /*
 	** Language errors that match DB2
 	*/
@@ -1549,7 +1546,6 @@ public interface SQLState {
     String CALENDAR_IS_NULL = "XJ090.S";
     String PARAM_NOT_OUT_OR_INOUT = "XJ091.S";
     String BLOB_TOO_LARGE_FOR_CLIENT  = "XJ093.S";
-    String OBJECT_ALREADY_CLOSED = "XJ094.S";
     String ERROR_PRIVILEGED_ACTION = "XJ095.S";
     String MISSING_RESOURCE_BUNDLE = "XJ096.S";
     String SAVEPOINT_NOT_CREATED_BY_CONNECTION = "XJ097.S";



Mime
View raw message