Merge branch 'help' into 'master'

Fix queueue

See merge request !169

code/moya-beans/ejbModule/fi/codecrew/moya/beans/QueueBean.java

@@ -123,7 +123,7 @@ public class QueueBean implements QueueBeanLocal {
 
 		public MapReservationQueueEntry remove(EventUser user)
 		{
-			if (user != null) {
+			if (user == null) {
 				return null;
 			}
 			MapReservationQueueEntry ret = null;
@@ -150,8 +150,9 @@ public class QueueBean implements QueueBeanLocal {
 					ret = new MapReservationQueueEntry();
 					queEntries.put(user, ret);
 					if (reserving.size() < reservingSize) {
-						boolean resStat = reserving.add(user);
-						logger.info("User {} not in queue and reserving smaller than size Entering directly: Success: {}", user, resStat);
+						checkReservingEntry();
+						
+						logger.info("User {} not in queue and reserving smaller than size Entering directly: Success: {}", user);
 					} else {
 						boolean queStat = queue.offer(user);
 						logger.info("User {} not in queue, offer state {}", user, queStat);