[Shox-cvs] SF.net SVN: shox:[2108] trunk/src/net/sf/shox/simulator/node/user/ MAC_IEEE802_11bg_DCF.java

[<dir...@us...>]

Revision: 2108
          http://shox.svn.sourceforge.net/shox/?rev=2108&view=rev
Author:   dirk_held
Date:     2009-10-16 13:58:49 +0000 (Fri, 16 Oct 2009)

Log Message:
-----------
cleared minor warning.

Modified Paths:
--------------
    trunk/src/net/sf/shox/simulator/node/user/MAC_IEEE802_11bg_DCF.java

Modified: trunk/src/net/sf/shox/simulator/node/user/MAC_IEEE802_11bg_DCF.java
===================================================================
--- trunk/src/net/sf/shox/simulator/node/user/MAC_IEEE802_11bg_DCF.java	2009-10-09 16:11:42 UTC (rev 2107)
+++ trunk/src/net/sf/shox/simulator/node/user/MAC_IEEE802_11bg_DCF.java	2009-10-16 13:58:49 UTC (rev 2108)
@@ -300,25 +300,27 @@
 				} else {
 					startCarrierSense(difs, backoffTime);
 				}
+				
 				return true;
-			} else {
-				if (as != null) {
-					Interval lastIncoming = as.getLastIncoming();
+			}
+			
+			if (as != null) {
+				Interval lastIncoming = as.getLastIncoming();
+				
+				if (lastIncoming != null) {
+					double end = lastIncoming.getEnd();
+					double now = node.getCurrentTime();
 					
-					if (lastIncoming != null) {
-						double end = lastIncoming.getEnd();
-						double now = node.getCurrentTime();
-						
-						if (end > now) {
-							if (LOGGER.isDebugEnabled()) {
-								LOGGER.debug("initiate a delayed trySend()");
-							}
-							sendEventSelf(new MACEvent(sender, end - now));
+					if (end > now) {
+						if (LOGGER.isDebugEnabled()) {
+							LOGGER.debug("initiate a delayed trySend()");
 						}
+						sendEventSelf(new MACEvent(sender, end - now));
 					}
 				}
 			}
 		}
+		
 		return false;
 	}
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.