db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oyste...@apache.org
Subject svn commit: r620522 - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/store/raw/RawStore.java engine/org/apache/derby/loc/messages.xml shared/org/apache/derby/shared/common/reference/SQLState.java
Date Mon, 11 Feb 2008 16:38:15 GMT
Author: oysteing
Date: Mon Feb 11 08:38:11 2008
New Revision: 620522

URL: http://svn.apache.org/viewvc?rev=620522&view=rev
Log:
DERBY-3392: Performing failover on a database not being replicated should give a more meaningful
error message.
Contributed by Narayanan.


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
    db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java?rev=620522&r1=620521&r2=620522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java Mon Feb
11 08:38:11 2008
@@ -523,7 +523,7 @@
         }
         catch (StandardException se) {
             throw StandardException.newException(
-                      SQLState.REPLICATION_UNABLE_TO_STOP_MASTER);
+                      SQLState.REPLICATION_NOT_IN_MASTER_MODE);
         }
         masterFactory.stopMaster();
     }
@@ -546,7 +546,7 @@
         }
         catch (StandardException se) {
             throw StandardException.newException
-                    (SQLState.REPLICATION_FAILOVER_UNSUCCESSFUL, se, dbname);
+                    (SQLState.REPLICATION_NOT_IN_MASTER_MODE);
         }
         masterFactory.startFailover();
     }

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=620522&r1=620521&r2=620522&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 Mon Feb 11 08:38:11
2008
@@ -4762,7 +4762,7 @@
             
             <msg>
                 <name>XRE07</name>
-                <text>Could not stop replication because the database is not in replication
master mode.</text>
+                <text>Could not perform operation because the database is not in replication
master mode.</text>
             </msg>
 
             <msg>

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=620522&r1=620521&r2=620522&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
Mon Feb 11 08:38:11 2008
@@ -1764,7 +1764,7 @@
     String REPLICATION_CONNECTION_EXCEPTION                        = "XRE04";
     String REPLICATION_LOG_OUT_OF_SYNCH                            = "XRE05";
     String REPLICATION_MASTER_TIMED_OUT                            = "XRE06";
-    String REPLICATION_UNABLE_TO_STOP_MASTER                       = "XRE07";
+    String REPLICATION_NOT_IN_MASTER_MODE                          = "XRE07";
     String REPLICATION_SLAVE_STARTED_OK                            = "XRE08";
     String CANNOT_START_SLAVE_ALREADY_BOOTED                       = "XRE09";
     String REPLICATION_CONFLICTING_ATTRIBUTES                      = "XRE10";



Mime
View raw message