db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r647470 - in /db/derby/code/branches/10.4/java/engine/org/apache/derby: iapi/error/SQLWarningFactory.java impl/store/replication/master/MasterController.java
Date Sat, 12 Apr 2008 16:50:18 GMT
Author: dyre
Date: Sat Apr 12 09:50:16 2008
New Revision: 647470

URL: http://svn.apache.org/viewvc?rev=647470&view=rev
Log:
Javadoc fixes (no jira).
Merged to 10.4 with svn merge -r 637199:637200 ../derby-scratch
No conflicts.

Modified:
    db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/error/SQLWarningFactory.java
    db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java

Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/error/SQLWarningFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/error/SQLWarningFactory.java?rev=647470&r1=647469&r2=647470&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/error/SQLWarningFactory.java
(original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/error/SQLWarningFactory.java
Sat Apr 12 09:50:16 2008
@@ -25,6 +25,10 @@
 
 import org.apache.derby.iapi.services.i18n.MessageService;
 
+
+// for javadoc 
+import org.apache.derby.shared.common.reference.SQLState;
+
 /**
  * This class generates SQLWarning instances. It has an understanding of Derby's
  * internal error/warning message Ids, and transforms these to localised error

Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java?rev=647470&r1=647469&r2=647470&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java
(original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java
Sat Apr 12 09:50:16 2008
@@ -285,7 +285,7 @@
     }
 
     /**
-     * @see org.apache.derby.iapi.services.replication.master.MasterFactory#startFailover()
+     * @see MasterFactory#startFailover()
      */
     public void startFailover() throws StandardException {
         if (!active) {



Mime
View raw message