Test that error packets don't get remapped

Author: Lloyd Watkin

src/main/java/org/buddycloud/channelserver/queue/FederatedQueueManager.java

@@ -71,18 +71,19 @@ private int getId() {
 
 	public void process(Packet packet) throws ComponentException {
 
-		logger.debug("Packet payload " + packet.toXML() + " going to federation.");
+		logger.debug("Packet payload " + packet.toXML()
+				+ " going to federation.");
 
 		String to = packet.getTo().toString();
-        String uniqueId = packet.getID();
-        
-        if (true == performIdMapping(packet)) {
+		String uniqueId = packet.getID();
+
+		if (true == performIdMapping(packet)) {
 
 			uniqueId = generateUniqueId(packet);
 			idMap.put(uniqueId, packet.getID());
 			packet.setID(uniqueId);
-        }
-        
+		}
+
 		sentRemotePackets.put(uniqueId, packet.getFrom());
 		try {
 			extractNodeDetails(packet);
@@ -123,7 +124,8 @@ private boolean performIdMapping(Packet packet) {
 			return false;
 		}
 		IQ iq = (IQ) packet;
-		if (true == iq.getType().equals(IQ.Type.result)) {
+		if ((true == iq.getType().equals(IQ.Type.result))
+				|| (true == iq.getType().equals(IQ.Type.error))) {
 			return false;
 		}
 		return true;

src/test/java/org/buddycloud/channelserver/queue/FederatedQueueManagerTest.java

@@ -296,4 +296,26 @@ public void testIqResultPacketsDontGetIdMapped() throws Exception {
 
 		Assert.assertTrue(originalId.equals(packetExternal.getID()));
 	}
+	
+	
+	@Test
+	public void testIqErrorPacketsDontGetIdMapped() throws Exception {
+		channelsEngine.clear();
+
+		String originalId = "id:12345";
+		IQ packet = new IQ();
+		packet.setFrom(new JID("romeo@montague.lit/street"));
+		packet.setTo(new JID("topics.capulet.lit"));
+		packet.setType(IQ.Type.error);
+		packet.setID(originalId);
+		packet.getElement().addAttribute("remote-server-discover", "false");
+		
+		queueManager.addChannelMap(new JID("topics.capulet.lit"));
+		
+		queueManager.process(packet.createCopy());
+		
+		IQ packetExternal = (IQ) channelsEngine.poll();
+
+		Assert.assertTrue(originalId.equals(packetExternal.getID()));
+	}
 }