0000781: Restart of jobs can cause embedded derby database connection…

…s to fail
JumpMind · Aug 22, 2012 · c45d4a8 · c45d4a8
1 parent c0c0790
commit c45d4a8
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 32 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/job/AbstractJob.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/job/AbstractJob.java
@@ -145,44 +145,49 @@ public boolean invoke(boolean force) {
             if (engine == null) {
                 log.info("Could not find a reference to the SymmetricEngine from {}", jobName);
             } else {
-                MDC.put("engineName", engine.getEngineName());
-                if (engine.isStarted()) {
-                    if (!paused || force) {
-                        if (!running) {
-                            running = true;
-                            synchronized (this) {
-                                ran = true;
-                                long startTime = System.currentTimeMillis();
-                                try {
-                                    if (!requiresRegistration
-                                            || (requiresRegistration && engine
-                                                    .getRegistrationService()
-                                                    .isRegisteredWithServer())) {
-                                        hasNotRegisteredMessageBeenLogged = false;
-                                        doJob(force);
-                                    } else {
-                                        if (!hasNotRegisteredMessageBeenLogged) {
-                                            log.warn(
-                                                    "Did not run the {} job because the engine is not registered.",
-                                                    getName());
-                                            hasNotRegisteredMessageBeenLogged = true;
+                if (!Thread.interrupted()) {
+                    MDC.put("engineName", engine.getEngineName());
+                    if (engine.isStarted()) {
+                        if (!paused || force) {
+                            if (!running) {
+                                running = true;
+                                synchronized (this) {
+                                    ran = true;
+                                    long startTime = System.currentTimeMillis();
+                                    try {
+                                        if (!requiresRegistration
+                                                || (requiresRegistration && engine
+                                                        .getRegistrationService()
+                                                        .isRegisteredWithServer())) {
+                                            hasNotRegisteredMessageBeenLogged = false;
+                                            doJob(force);
+                                        } else {
+                                            if (!hasNotRegisteredMessageBeenLogged) {
+                                                log.warn(
+                                                        "Did not run the {} job because the engine is not registered.",
+                                                        getName());
+                                                hasNotRegisteredMessageBeenLogged = true;
+                                            }
                                         }
+                                    } finally {
+                                        lastFinishTime = new Date();
+                                        long endTime = System.currentTimeMillis();
+                                        lastExecutionTimeInMs = endTime - startTime;
+                                        totalExecutionTimeInMs += lastExecutionTimeInMs;
+                                        if (lastExecutionTimeInMs > Constants.LONG_OPERATION_THRESHOLD) {
+                                            engine.getStatisticManager().addJobStats(jobName,
+                                                    startTime, endTime, 0);
+                                        }
+                                        numberOfRuns++;
+                                        running = false;
                                     }
-                                } finally {
-                                    lastFinishTime = new Date();
-                                    long endTime = System.currentTimeMillis();
-                                    lastExecutionTimeInMs = endTime - startTime;
-                                    totalExecutionTimeInMs += lastExecutionTimeInMs;
-                                    if (lastExecutionTimeInMs > Constants.LONG_OPERATION_THRESHOLD) {
-                                        engine.getStatisticManager().addJobStats(jobName,
-                                                startTime, endTime, 0);
-                                    }
-                                    numberOfRuns++;
-                                    running = false;
                                 }
                             }
                         }
+                    } else {
+                        log.warn("This thread was interrupted.  Not executing the job until the interrupted status has cleared");
                     }
+
                 } else {
                     log.info("The engine is not currently started.");
                 }

diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/job/JobManager.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/job/JobManager.java
@@ -87,6 +87,7 @@ public synchronized void stopJobs() {
         for (IJob job : jobs) {
             job.stop();
         }      
+        Thread.interrupted();
     }
 
     public synchronized void destroy () {