Bugfix in channel unsubscribe.

phlegx · phlegx · commit d7860166c06b · 2015-06-29T21:02:59.000+02:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# WebsocketRailsClient++ (v0.7.4-NB)
+# WebsocketRailsClient++ (v0.7.5-NB)
 
 WebsocketRailsClient++ is a C++ library that uses the implementation of RFC6455 (The WebSocket Protocol)
 implemented in the WebSocket++ library, the Json++ light-weight JSON parser and the Boost library. It allows
diff --git a/websocket-rails-client/channel.cpp b/websocket-rails-client/channel.cpp
@@ -1,7 +1,7 @@
 /**
  *
  * Name        : channel.cpp
- * Version     : v0.7.4-NB
+ * Version     : v0.7.5-NB
  * Description : Channel Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems
diff --git a/websocket-rails-client/channel.hpp b/websocket-rails-client/channel.hpp
@@ -1,7 +1,7 @@
 /**
  *
  * Name        : channel.hpp
- * Version     : v0.7.4-NB
+ * Version     : v0.7.5-NB
  * Description : Channel Header Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems
diff --git a/websocket-rails-client/event.cpp b/websocket-rails-client/event.cpp
@@ -1,7 +1,7 @@
 /**
  *
  * Name        : event.cpp
- * Version     : v0.7.4-NB
+ * Version     : v0.7.5-NB
  * Description : Event Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems
diff --git a/websocket-rails-client/event.hpp b/websocket-rails-client/event.hpp
@@ -1,7 +1,7 @@
 /**
  *
  * Name        : event.hpp
- * Version     : v0.7.4-NB
+ * Version     : v0.7.5-NB
  * Description : Event Header Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems
diff --git a/websocket-rails-client/websocket.hpp b/websocket-rails-client/websocket.hpp
@@ -1,7 +1,7 @@
 /**
  *
  * Name        : websocket.hpp
- * Version     : v0.7.4-NB
+ * Version     : v0.7.5-NB
  * Description : Websocket Header File in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems
diff --git a/websocket-rails-client/websocket_connection.cpp b/websocket-rails-client/websocket_connection.cpp
@@ -1,7 +1,7 @@
 /**
  *
  * Name        : websocket.cpp
- * Version     : v0.7.4-NB
+ * Version     : v0.7.5-NB
  * Description : WebsocketConnection Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems
diff --git a/websocket-rails-client/websocket_connection.hpp b/websocket-rails-client/websocket_connection.hpp
@@ -1,7 +1,7 @@
 /**
  *
  * Name        : websocket.hpp
- * Version     : v0.7.4-NB
+ * Version     : v0.7.5-NB
  * Description : WebsocketConnection Header Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems
diff --git a/websocket-rails-client/websocket_rails.cpp b/websocket-rails-client/websocket_rails.cpp
@@ -1,7 +1,7 @@
 /**
  *
  * Name        : websocket_rails.cpp
- * Version     : v0.7.4-NB
+ * Version     : v0.7.5-NB
  * Description : WebsocketRails Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems
@@ -264,31 +264,31 @@ Channel * WebsocketRails::subscribePrivate(std::string channel_name, cb_func suc
 
 
 void WebsocketRails::unsubscribe(std::string channel_name) {
-  Channel * channel;
+  Channel channel;
   {
     websocket_rails_lock guard(channel_queue_mutex);
     if(this->channel_queue.find(channel_name) == this->channel_queue.end()) {
       return;
     }
-    channel = &this->channel_queue[channel_name];
+    channel = this->channel_queue[channel_name];
     this->channel_queue.erase(channel_name);
   }
   cb_func success_callback, failure_callback;
-  channel->destroy(success_callback, failure_callback);
+  channel.destroy(success_callback, failure_callback);
 }
 
 
 void WebsocketRails::unsubscribe(std::string channel_name, cb_func success_callback, cb_func failure_callback) {
-  Channel * channel;
+  Channel channel;
   {
     websocket_rails_lock guard(channel_queue_mutex);
     if(this->channel_queue.find(channel_name) == this->channel_queue.end()) {
       return;
     }
-    channel = &this->channel_queue[channel_name];
+    channel = this->channel_queue[channel_name];
     this->channel_queue.erase(channel_name);
   }
-  channel->destroy(success_callback, failure_callback);
+  channel.destroy(success_callback, failure_callback);
 }
 
 
diff --git a/websocket-rails-client/websocket_rails.hpp b/websocket-rails-client/websocket_rails.hpp
@@ -1,7 +1,7 @@
 /**
  *
  * Name        : websocket_rails.hpp
- * Version     : v0.7.4-NB
+ * Version     : v0.7.5-NB
  * Description : WesocketRails Header Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# WebsocketRailsClient++ (v0.7.4-NB)`
	`1`	`+# WebsocketRailsClient++ (v0.7.5-NB)`
`2`	`2`
`3`	`3`	`WebsocketRailsClient++ is a C++ library that uses the implementation of RFC6455 (The WebSocket Protocol)`
`4`	`4`	`implemented in the WebSocket++ library, the Json++ light-weight JSON parser and the Boost library. It allows`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`*`
`3`	`3`	`* Name : channel.cpp`
`4`		`- * Version : v0.7.4-NB`
	`4`	`+ * Version : v0.7.5-NB`
`5`	`5`	`* Description : Channel Class in C++, Ansi-style`
`6`	`6`	`* Author : Egon Zemmer`
`7`	`7`	`* Company : Phlegx Systems`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`*`
`3`	`3`	`* Name : channel.hpp`
`4`		`- * Version : v0.7.4-NB`
	`4`	`+ * Version : v0.7.5-NB`
`5`	`5`	`* Description : Channel Header Class in C++, Ansi-style`
`6`	`6`	`* Author : Egon Zemmer`
`7`	`7`	`* Company : Phlegx Systems`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`*`
`3`	`3`	`* Name : event.cpp`
`4`		`- * Version : v0.7.4-NB`
	`4`	`+ * Version : v0.7.5-NB`
`5`	`5`	`* Description : Event Class in C++, Ansi-style`
`6`	`6`	`* Author : Egon Zemmer`
`7`	`7`	`* Company : Phlegx Systems`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`*`
`3`	`3`	`* Name : event.hpp`
`4`		`- * Version : v0.7.4-NB`
	`4`	`+ * Version : v0.7.5-NB`
`5`	`5`	`* Description : Event Header Class in C++, Ansi-style`
`6`	`6`	`* Author : Egon Zemmer`
`7`	`7`	`* Company : Phlegx Systems`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`*`
`3`	`3`	`* Name : websocket.hpp`
`4`		`- * Version : v0.7.4-NB`
	`4`	`+ * Version : v0.7.5-NB`
`5`	`5`	`* Description : Websocket Header File in C++, Ansi-style`
`6`	`6`	`* Author : Egon Zemmer`
`7`	`7`	`* Company : Phlegx Systems`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`*`
`3`	`3`	`* Name : websocket.cpp`
`4`		`- * Version : v0.7.4-NB`
	`4`	`+ * Version : v0.7.5-NB`
`5`	`5`	`* Description : WebsocketConnection Class in C++, Ansi-style`
`6`	`6`	`* Author : Egon Zemmer`
`7`	`7`	`* Company : Phlegx Systems`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`*`
`3`	`3`	`* Name : websocket_rails.cpp`
`4`		`- * Version : v0.7.4-NB`
	`4`	`+ * Version : v0.7.5-NB`
`5`	`5`	`* Description : WebsocketRails Class in C++, Ansi-style`
`6`	`6`	`* Author : Egon Zemmer`
`7`	`7`	`* Company : Phlegx Systems`
`@@ -264,31 +264,31 @@ Channel * WebsocketRails::subscribePrivate(std::string channel_name, cb_func suc`
`264`	`264`
`265`	`265`
`266`	`266`	`void WebsocketRails::unsubscribe(std::string channel_name) {`
`267`		`- Channel * channel;`
	`267`	`+ Channel channel;`
`268`	`268`	`{`
`269`	`269`	`websocket_rails_lock guard(channel_queue_mutex);`
`270`	`270`	`if(this->channel_queue.find(channel_name) == this->channel_queue.end()) {`
`271`	`271`	`return;`
`272`	`272`	`}`
`273`		`- channel = &this->channel_queue[channel_name];`
	`273`	`+ channel = this->channel_queue[channel_name];`
`274`	`274`	`this->channel_queue.erase(channel_name);`
`275`	`275`	`}`
`276`	`276`	`cb_func success_callback, failure_callback;`
`277`		`- channel->destroy(success_callback, failure_callback);`
	`277`	`+ channel.destroy(success_callback, failure_callback);`
`278`	`278`	`}`
`279`	`279`
`280`	`280`
`281`	`281`	`void WebsocketRails::unsubscribe(std::string channel_name, cb_func success_callback, cb_func failure_callback) {`
`282`		`- Channel * channel;`
	`282`	`+ Channel channel;`
`283`	`283`	`{`
`284`	`284`	`websocket_rails_lock guard(channel_queue_mutex);`
`285`	`285`	`if(this->channel_queue.find(channel_name) == this->channel_queue.end()) {`
`286`	`286`	`return;`
`287`	`287`	`}`
`288`		`- channel = &this->channel_queue[channel_name];`
	`288`	`+ channel = this->channel_queue[channel_name];`
`289`	`289`	`this->channel_queue.erase(channel_name);`
`290`	`290`	`}`
`291`		`- channel->destroy(success_callback, failure_callback);`
	`291`	`+ channel.destroy(success_callback, failure_callback);`
`292`	`292`	`}`
`293`	`293`
`294`	`294`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`*`
`3`	`3`	`* Name : websocket_rails.hpp`
`4`		`- * Version : v0.7.4-NB`
	`4`	`+ * Version : v0.7.5-NB`
`5`	`5`	`* Description : WesocketRails Header Class in C++, Ansi-style`
`6`	`6`	`* Author : Egon Zemmer`
`7`	`7`	`* Company : Phlegx Systems`