[svn-commits] tzafrir: branch 1.4 r3158 - in /branches/1.4: ./ xpp/utils/zconf/Zaptel/Chans.pm

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Thu Oct 18 15:32:18 2007
New Revision: 3158

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3158
Log:
Fix zaptel_hardware's behaviour for unknown span types.

Merged revisions 3157 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

Modified:
    branches/1.4/   (props changed)
    branches/1.4/xpp/utils/zconf/Zaptel/Chans.pm

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/xpp/utils/zconf/Zaptel/Chans.pm
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/utils/zconf/Zaptel/Chans.pm?view=diff&rev=3158&r1=3157&r2=3158
==============================================================================
--- branches/1.4/xpp/utils/zconf/Zaptel/Chans.pm (original)
+++ branches/1.4/xpp/utils/zconf/Zaptel/Chans.pm Thu Oct 18 15:32:18 2007
@@ -61,7 +61,9 @@
 		$type = undef;
 	}
 	$self->type($type);
-	$self->span()->type($type) if $self->span()->type() eq 'UNKNOWN';
+	$self->span()->type($type)
+		if ! defined($self->span()->type()) ||
+			$self->span()->type() eq 'UNKNOWN';
 	return $self;
 }