Changeset 4819

Timestamp:

Mar 18, 2009, 2:10:14 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #1248: Long running job may cause a timeout on session on internal job queue

Fixes and old error in the tests that was discovered by the fix to #1248.

Location:

trunk/src

Files:

• core/net/sf/basedb/core/Job.java (modified) (2 diffs)
• test/TestPluginDefinition.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/Job.java

@@ -1670 +1670 @@
       {
         dc = sc.newDbControl();
-        Job job = Job.getById(dc, jobId);
+        Job job = jobId == 0 ? this.job : Job.getById(dc, jobId);
         if (signalTransporter != null && signalId != null)
         {
@@ -1694 +1694 @@
       {
         dc = sc.newDbControl();
-        Job job = Job.getById(dc, jobId);
+        Job job = jobId == 0 ? this.job : Job.getById(dc, jobId);
         job.getData().setDryRun(response.isDryRun());
 

trunk/src/test/TestPluginDefinition.java

@@ -273 +273 @@
       job.setParameterValue("shouldFail", new BooleanParameterType(), shouldFail);
       job.setParameterValue("numNews", new IntegerParameterType(), numNews);
+      dc.saveItem(job);
+      dc.commit();
+      jobId = job.getId();
       
+      dc = TestUtil.getDbControl();
+      job = Job.getById(dc, jobId);
       PluginExecutionRequest request = 
         job.execute(TestUtil.getSilent() ? null : new ConsoleProgressReporter(), TestUtil.getLocalIp());
-      
       dc.commit();
-      jobId = job.getId();
       
       PluginResponse response = request.invoke();