@@ -26,6 +26,11 @@

  * along with this program; if not, write to the Free Software 

  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  */

+/*

+ * History:

+ * --------

+ *  2003-06-27  tm_stats & friends freed on exit only if non-null (andrei)

+ */

 #include "defs.h"

@@ -39,7 +44,7 @@

 #include "../../fifo_server.h"

 #include "../../pt.h"

-struct t_stats *tm_stats;

+struct t_stats *tm_stats=0;

 /* we don't worry about locking data during reads (unlike

@@ -147,10 +152,13 @@ int init_tm_stats(void)

 error4:

 	shm_free(tm_stats->s_client_transactions);

+	tm_stats->s_client_transactions=0;

 error3:

 	shm_free(tm_stats->s_transactions);

+	tm_stats->s_transactions=0;

 error2:

 	shm_free(tm_stats->s_waiting);

+	tm_stats->s_waiting=0;

 error1:

 	shm_free(tm_stats);

 error0:

@@ -159,8 +167,13 @@ error0:

 void free_tm_stats()

 {

-	shm_free(tm_stats->s_client_transactions);

-	shm_free(tm_stats->s_transactions);

-	shm_free(tm_stats->s_waiting);

-	shm_free(tm_stats);

+	if (tm_stats!=0){

+		if (tm_stats->s_client_transactions) 

+			shm_free(tm_stats->s_client_transactions);

+		if (tm_stats->s_transactions)

+			shm_free(tm_stats->s_transactions);

+		if (tm_stats->s_waiting)

+			shm_free(tm_stats->s_waiting);

+		shm_free(tm_stats);

+	}

 }

@@ -92,6 +92,11 @@

 	a REPLY_LOCK.

 */

+/*

+ * History:

+ * --------

+ *  2003-06-27  timers are not unlinked if timerlist is 0 (andrei)

+ */

 #include "defs.h"

@@ -114,7 +119,7 @@

 #include "t_cancel.h"

-static struct timer_table *timertable;

+static struct timer_table *timertable=0;

 int noisy_ctimer=0;

@@ -463,6 +468,7 @@ void unlink_timer_lists()

 	struct timer_link  *tl, *end, *tmp;

 	enum lists i;

+	if (timertable==0) return; /* nothing to do */

 	/* remember the DELETE LIST */

 	tl = timertable->timers[DELETE_LIST].first_tl.next_tl;

 	end = & timertable->timers[DELETE_LIST].last_tl;