[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r319073 - in /team/irroot/dist...

[SVN commits to the Asterisk project]

Author: irroot
Date: Mon May 16 05:04:06 2011
New Revision: 319073

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319073
Log:
Fix a locking issue channel may not have been unlocked


Modified:
    team/irroot/distrotech-customers-1.8/   (props changed)
    team/irroot/distrotech-customers-1.8/cel/cel_odbc.c   (props changed)
    team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample   (props changed)
    team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql   (props changed)
    team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql   (props changed)
    team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql   (props changed)
    team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql   (props changed)
    team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql   (props changed)
    team/irroot/distrotech-customers-1.8/res/res_fax.c

Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 05:04:06 2011
@@ -1,3 +1,4 @@
 /be/branches/C.3:256426
+/team/irroot/distrotech-customers-1.8:319067
 /team/irroot/t38gateway-1.8:318979-319017
-/team/irroot/t38gateway-trunk:318977-319016
+/team/irroot/t38gateway-trunk:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 05:04:06 2011
@@ -1,3 +1,4 @@
 /be/branches/C.3/cel/cel_adaptive_odbc.c:256426
+/team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319067
 /team/irroot/t38gateway-1.8/cel/cel_odbc.c:318979-319017
-/team/irroot/t38gateway-trunk/cel/cel_odbc.c:318977-319016
+/team/irroot/t38gateway-trunk/cel/cel_odbc.c:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 05:04:06 2011
@@ -1,3 +1,4 @@
 /be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
+/team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319067
 /team/irroot/t38gateway-1.8/configs/cel_odbc.conf.sample:318979-319017
-/team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318977-319016
+/team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 05:04:06 2011
@@ -1,2 +1,3 @@
+/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql:319067
 /team/irroot/t38gateway-1.8/contrib/realtime/mysql/iaxfriends.sql:318979-319017
-/team/irroot/t38gateway-trunk/contrib/realtime/mysql/iaxfriends.sql:318977-319016
+/team/irroot/t38gateway-trunk/contrib/realtime/mysql/iaxfriends.sql:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 05:04:06 2011
@@ -1,2 +1,3 @@
+/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql:319067
 /team/irroot/t38gateway-1.8/contrib/realtime/mysql/meetme.sql:318979-319017
-/team/irroot/t38gateway-trunk/contrib/realtime/mysql/meetme.sql:318977-319016
+/team/irroot/t38gateway-trunk/contrib/realtime/mysql/meetme.sql:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 05:04:06 2011
@@ -1,2 +1,3 @@
+/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql:319067
 /team/irroot/t38gateway-1.8/contrib/realtime/mysql/sipfriends.sql:318979-319017
-/team/irroot/t38gateway-trunk/contrib/realtime/mysql/sipfriends.sql:318977-319016
+/team/irroot/t38gateway-trunk/contrib/realtime/mysql/sipfriends.sql:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 05:04:06 2011
@@ -1,2 +1,3 @@
+/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql:319067
 /team/irroot/t38gateway-1.8/contrib/realtime/mysql/voicemail.sql:318979-319017
-/team/irroot/t38gateway-trunk/contrib/realtime/mysql/voicemail.sql:318977-319016
+/team/irroot/t38gateway-trunk/contrib/realtime/mysql/voicemail.sql:318977-319016,319067,319071

Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 05:04:06 2011
@@ -1,2 +1,3 @@
+/team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql:319067
 /team/irroot/t38gateway-1.8/contrib/realtime/postgresql/realtime.sql:318979-319017
-/team/irroot/t38gateway-trunk/contrib/realtime/postgresql/realtime.sql:318977-319016
+/team/irroot/t38gateway-trunk/contrib/realtime/postgresql/realtime.sql:318977-319016,319067,319071

Modified: team/irroot/distrotech-customers-1.8/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/res/res_fax.c?view=diff&rev=319073&r1=319072&r2=319073
==============================================================================
--- team/irroot/distrotech-customers-1.8/res/res_fax.c (original)
+++ team/irroot/distrotech-customers-1.8/res/res_fax.c Mon May 16 05:04:06 2011
@@ -2788,8 +2788,8 @@
 			}
 			ast_framehook_detach(chan, gateway->framehook);
 		}
-		ast_channel_unlock(chan);
-	}
+	}
+	ast_channel_unlock(chan);
 }
 
 /*! \brief Alternate wait app that listens for CNG