Changeset 6b288b in git

Timestamp:

Nov 27, 2013, 4:35:30 PM (10 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

6b3f5d8f5808907789567b6bbe03da3cd4e7e899

Parents:

d3063fda87edfbb83154427f69508683dd741123

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-11-27 16:35:30+01:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-11-27 16:43:49+01:00

Message:

chg: defer shutdown in slClose()
(cherry picked from commit 96d98ec5e074988d6acae83de7646fc65aa7382b)

Signed-off-by: Andreas Steenpass <steenpass@mathematik.uni-kl.de>

Conflicts:
	Singular/silink.cc

File:

• Singular/links/silink.cc (modified) (2 diffs)

Singular/links/silink.cc

@@ -245 +245 @@
     return FALSE;
 
+  defer_shutdown++;
   BOOLEAN res = TRUE;
   if (l->m->Close != NULL)
@@ -253 +254 @@
            l->m->type, l->mode, l->name);
   }
+  defer_shutdown--;
+  if (!defer_shutdown && do_shutdown) m2_end(1);
   return res;
 }