Commits

Anonymous committed e734df8

Issue number: QUARTZ-281
Obtained from:
Submitted by:
Reviewed by:
CVS: ----------------------------------------------------------------------
CVS: Issue number:
CVS: If this change addresses one or more issues,
CVS: then enter the issue number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to the project by someone else; i.e.,
CVS: they sent us a patch or a set of diffs, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.

git-svn-id: http://svn.opensymphony.com/svn/quartz/branches/b_quartz_1-5-x@31469f7d36a-ea1c-0410-88ea-9fd03e4c9665

Comments (0)

Files changed (4)

src/java/org/quartz/impl/jdbcjobstore/DriverDelegate.java

      *          the DB Connection
      * @return the number of updated rows.
      */
-    public int updateSchedulerState(Connection conn, String instanceId, long checkInTime)
+    public int updateSchedulerState(Connection conn, String instanceId, long checkInTime, String recoverer)
             throws SQLException;
     
     /**

src/java/org/quartz/impl/jdbcjobstore/JobStoreSupport.java

 
             // check in...
             lastCheckin = System.currentTimeMillis();
-            if(getDelegate().updateSchedulerState(conn, getInstanceId(), lastCheckin) == 0) {
+            if(getDelegate().updateSchedulerState(conn, getInstanceId(), lastCheckin, null) == 0) {
                 getDelegate().insertSchedulerState(conn, getInstanceId(),
                         lastCheckin, getClusterCheckinInterval(), null);
             }

src/java/org/quartz/impl/jdbcjobstore/StdJDBCConstants.java

 
     public static final String UPDATE_SCHEDULER_STATE = "UPDATE "
         + TABLE_PREFIX_SUBST + TABLE_SCHEDULER_STATE + " SET " 
-        + COL_LAST_CHECKIN_TIME + " = ? WHERE "
+        + COL_LAST_CHECKIN_TIME + " = ?, " + COL_RECOVERER + " = ? WHERE "
         + COL_INSTANCE_NAME + " = ?";
 
     public static final String INSERT_PAUSED_TRIGGER_GROUP = "INSERT INTO "

src/java/org/quartz/impl/jdbcjobstore/StdJDBCDelegate.java

         }
     }
 
-    public int updateSchedulerState(Connection conn, String instanceId, long checkInTime)
+    public int updateSchedulerState(Connection conn, String instanceId, long checkInTime, String recoverer)
             throws SQLException {
         PreparedStatement ps = null;
         try {
             ps = conn.prepareStatement(rtp(UPDATE_SCHEDULER_STATE));
             ps.setLong(1, checkInTime);
-            ps.setString(2, instanceId);
+            ps.setString(2, recoverer);
+            ps.setString(3, instanceId);
         
             return ps.executeUpdate();
         } finally {