[asterisk-commits] rmudgett: branch 1.6.0 r168607 - /branches/1.6.0/channels/misdn/isdn_lib.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jan 14 13:20:29 2009
New Revision: 168607

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168607
Log:
Fix merge error caused by merging -r132883 and -r121770 from
https://origsvn.digium.com/svn/asterisk/trunk out of order.

(closes issue #13788)
Reported by: IgorG

(closes issue #13491)
Reported by: avalentin

Modified:
    branches/1.6.0/channels/misdn/isdn_lib.c

Modified: branches/1.6.0/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/misdn/isdn_lib.c?view=diff&rev=168607&r1=168606&r2=168607
==============================================================================
--- branches/1.6.0/channels/misdn/isdn_lib.c (original)
+++ branches/1.6.0/channels/misdn/isdn_lib.c Wed Jan 14 13:20:29 2009
@@ -3134,7 +3134,7 @@
 	struct timeval now;
 	gettimeofday(&now, NULL);
 	if (!bc->in_use) {
-		if ( bc->last_used.tv_sec == now.tv_sec ) {
+		if (misdn_lib_port_is_pri(bc->port) && bc->last_used.tv_sec == now.tv_sec ) {
 			cb_log(2,bc->port, "channel with stid:%x for one second still in use! (n:%d lu:%d)\n", bc->b_stid, (int) now.tv_sec, (int) bc->last_used.tv_sec);
 			return 1;
 		}