Dont delete unset tlskey (closes confluentinc#78)

edenhill · edenhill · commit d732893a7485 · 2016-11-28T21:23:12.000+01:00
diff --git a/confluent_kafka/src/confluent_kafka.c b/confluent_kafka/src/confluent_kafka.c
@@ -962,7 +962,8 @@ void Handle_clear (Handle *h) {
 	if (h->stats_cb)
 		Py_DECREF(h->stats_cb);
 
-	PyThread_delete_key(h->tlskey);
+        if (h->initiated)
+                PyThread_delete_key(h->tlskey);
 }
 
 /**
@@ -1322,6 +1323,7 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
 	rd_kafka_conf_set_opaque(conf, h);
 
 	h->tlskey = PyThread_create_key();
+        h->initiated = 1;
 
 	return conf;
 }
diff --git a/confluent_kafka/src/confluent_kafka.h b/confluent_kafka/src/confluent_kafka.h
@@ -115,7 +115,8 @@ typedef struct {
 	rd_kafka_t *rk;
 	PyObject *error_cb;
 	PyObject *stats_cb;
-	int tlskey;  /* Thread-Local-Storage key */
+        int initiated;
+        int tlskey;  /* Thread-Local-Storage key */
 
 	union {
 		/**

Original file line number	Diff line number	Diff line change
`@@ -962,7 +962,8 @@ void Handle_clear (Handle *h) {`
`962`	`962`	`if (h->stats_cb)`
`963`	`963`	`Py_DECREF(h->stats_cb);`
`964`	`964`
`965`		`- PyThread_delete_key(h->tlskey);`
	`965`	`+ if (h->initiated)`
	`966`	`+ PyThread_delete_key(h->tlskey);`
`966`	`967`	`}`
`967`	`968`
`968`	`969`	`/**`
`@@ -1322,6 +1323,7 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,`
`1322`	`1323`	`rd_kafka_conf_set_opaque(conf, h);`
`1323`	`1324`
`1324`	`1325`	`h->tlskey = PyThread_create_key();`
	`1326`	`+ h->initiated = 1;`
`1325`	`1327`
`1326`	`1328`	`return conf;`
`1327`	`1329`	`}`