Fixed a small bug in LearningSwitch.java. Fixed a typo in a comment i…

…n ForwardingBase.java.
yihua · Dec 29, 2014 · c6fff53 · c6fff53
1 parent 919fc9f
commit c6fff53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java b/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java
@@ -173,7 +173,7 @@ protected void removeFromPortMap(IOFSwitch sw, MacAddress mac, VlanVid vlan) {
      */
     public OFPort getFromPortMap(IOFSwitch sw, MacAddress mac, VlanVid vlan) {
         if (vlan == VlanVid.FULL_MASK) {
-            vlan = VlanVid.FULL_MASK;
+            vlan = VlanVid.ofVlan(0);
         }
         Map<MacVlanPair, OFPort> swMap = macVlanToSwitchPortMap.get(sw);
         if (swMap != null) {

diff --git a/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java b/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
@@ -191,7 +191,7 @@ public Command receive(IOFSwitch sw, OFMessage msg, FloodlightContext cntx) {
 	 *        written to the switch
 	 * @param flowModCommand flow mod. command to use, e.g. OFFlowMod.OFPFC_ADD,
 	 *        OFFlowMod.OFPFC_MODIFY etc.
-	 * @return srcSwitchIincluded True if the source switch is included in this route
+	 * @return srcSwitchIncluded True if the source switch is included in this route
 	 */
 	@LogMessageDocs({
 		@LogMessageDoc(level="WARN",