Tuukka Kivilahti · @tkfftk · Tuomas Riihimäki · Tuomas Riihimäki
--- a/code/moya-beans/ejbModule/fi/codecrew/moya/beans/map/MapQueue.java
+++ b/code/moya-beans/ejbModule/fi/codecrew/moya/beans/map/MapQueue.java
 	public MapQueue(EventMap map) {
 		this.mapId = map.getId();
+	}
+
+	public MapQueue(EventMap map, MapQueueRules rules) {
+		this(map);
  
+		if(rules != null) {
+			this.defaultTimeoutMin = rules.getDefaultTimeoutMin();
+			this.minimumSlotsInQueue = rules.getMinimumSlotsInQueue();
+			this.reservingSize = rules.getReservingSize();
+			this.biggestFirst = rules.getBiggestFirst();
+		}
 	}
  
-	void timeoutEntries() {
--- a/code/moya-beans/ejbModule/fi/codecrew/moya/beans/map/MapQueue.java
+++ b/code/moya-beans/ejbModule/fi/codecrew/moya/beans/map/MapQueue.java
  
 	private final AtomicBoolean modifyReservers = new AtomicBoolean(false);
  
+
 	private void checkReservingEntry() {
  
 		if (reserving.size() < getReservingSize() && modifyReservers.compareAndSet(false, true)) {
  
 			try {
-				if (reserving.size() < getReservingSize()) {
-					MapReservationQueueEntry queEntry = queue.poll();
+				if (reserving.size() < getReservingSize() && !queue.isEmpty()) {
+
+					MapReservationQueueEntry queEntry = queue.get(0);
+					queue.remove(0);