From 47d9d091d1b69649ab8fed2cd93b15e203943148 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 11 Feb 2013 13:41:49 +0000 Subject: [PATCH] fix code in L3/Extreme to pass tests and be more correct --- Info/Layer3/Extreme.pm | 6 +++--- MANIFEST.SKIP | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Info/Layer3/Extreme.pm b/Info/Layer3/Extreme.pm index 1411624c..d6bc344a 100644 --- a/Info/Layer3/Extreme.pm +++ b/Info/Layer3/Extreme.pm @@ -465,15 +465,15 @@ sub i_vlan_membership { # Some devices support Q-Bridge, if so short circuit and return it my $q_bridge = $extreme->SUPER::i_vlan_membership($partial); - return $q_bridge if (keys $q_bridge); + return $q_bridge if (ref {} eq ref $q_bridge and scalar keys %$q_bridge); # Next we try extremeVlanOpaqueTable my $xos = $extreme->_xos_i_vlan_membership($partial); - return $xos if (keys $xos); + return $xos if (ref {} eq ref $xos and scalar keys %$xos); # Try older ifStack method my $extremeware = $extreme->_extremeware_i_vlan_membership($partial); - return $extremeware if (keys $extremeware); + return $extremeware if (ref {} eq ref $extremeware and scalar keys %$extremeware); return; } diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index 1c35be37..07bf5347 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -10,6 +10,7 @@ ^Makefile$ ^blib/ ^MakeMaker-\d +pm_to_blib # Temp, old and emacs backup files. ~$