Changeset 4498 for branches/2.8-stable

Timestamp:

Sep 10, 2008, 11:06:57 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1117: Job agents don't allow a job to be executed when the owner is missing permission to the "active project"

Location:

branches/2.8-stable/src

Files:

• clients/jobagent/net/sf/basedb/clients/jobagent/Agent.java (modified) (1 diff)
• clients/jobagent/net/sf/basedb/clients/jobagent/executors/ThreadJobExecutor.java (modified) (1 diff)
• core/net/sf/basedb/core/InternalJobQueue.java (modified) (1 diff)

branches/2.8-stable/src/clients/jobagent/net/sf/basedb/clients/jobagent/Agent.java

@@ -754 +754 @@
         catch (Throwable t)
         {
-          log.error("Exception while setting active project to " + projectId + 
-            ". Continuing with no active project.", t);
+          log.warn("Exception while setting active project to Project[id=" + projectId + 
+            "]. Continuing with no active project.", t);
         }
       }

branches/2.8-stable/src/clients/jobagent/net/sf/basedb/clients/jobagent/executors/ThreadJobExecutor.java

@@ -183 +183 @@
       
       impersonated = sc.impersonateLogin(job, "Running job: " + job.getName());
-      if (job.getActiveProjectId() != 0)
+      int projectId = job.getActiveProjectId();
+      if (projectId != 0)
       {
         dc = impersonated.newDbControl();
-        Project activeProject = Project.getById(dc, job.getActiveProjectId());
-        impersonated.setActiveProject(activeProject);
+        try
+        {
+          Project activeProject = Project.getById(dc, projectId);
+          impersonated.setActiveProject(activeProject);
+        }
+        catch (Throwable t)
+        {
+          log.warn("Exception while setting active project to Project[id=" + projectId + 
+              "]. Continuing with no active project.", t);
+        }
         dc.close();
       }

branches/2.8-stable/src/core/net/sf/basedb/core/InternalJobQueue.java

@@ -483 +483 @@
           catch (Throwable t)
           {
-            log.error("Exception while setting active project. Continuing with no active project.", t);
+            log.warn("Exception while setting active project to Project[id=" + projectId + 
+                "]. Continuing with no active project.", t);
           }
         }