Skip to content

4.1.4 Release #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
braddaw merged 2 commits into from
Dec 11, 2012
+6 −5
Merged

4.1.4 Release #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fff508
echan: fix to Jira TRQ-1506 - pbs_server segfault in unlock_queue.
Dec 7, 2012
5a6cb67
echan: Fix for TRQ-1506 - pbs_server segfault in unlock_queue call. M…
Dec 8, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/server/queue_func.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,9 @@ int get_parent_dest_queues(

strcpy(jobid, pjob->ji_qs.ji_jobid);

*parent = NULL;
*dest = NULL;

if ((queue_parent_name != NULL) && (queue_dest_name != NULL))
{
if (!strcmp(queue_parent_name, queue_dest_name))
Expand All @@ -696,8 +699,6 @@ int get_parent_dest_queues(

unlock_queue(*parent, __func__, NULL, LOGLEVEL);

*parent = NULL;
*dest = NULL;

lock_allques_mutex(&svr_queues, __func__, NULL, LOGLEVEL);

Expand Down
6 changes: 3 additions & 3 deletions src/server/svr_movejob.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@ int local_move(
int parent_queue_mutex_held)

{
pbs_queue *routing_que;
pbs_queue *dest_que;
pbs_queue *tmp_que;
pbs_queue *routing_que = NULL;
pbs_queue *dest_que = NULL;
pbs_queue *tmp_que = NULL;
char *destination = pjob->ji_qs.ji_destin;
int mtype;
char log_buf[LOCAL_LOG_BUF_SIZE];
Expand Down