ooo-build r12979 - in trunk: . patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Thu Jun 26 17:04:07 2008
New Revision: 12979
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12979&view=rev

Log:
        * patches/dev300/webdav-locking-refresh-lock.diff: Don't go below 0 in
          the expiration counter in case we are really really busy ;-)


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/webdav-locking-refresh-lock.diff

Modified: trunk/patches/dev300/webdav-locking-refresh-lock.diff
==============================================================================
--- trunk/patches/dev300/webdav-locking-refresh-lock.diff	(original)
+++ trunk/patches/dev300/webdav-locking-refresh-lock.diff	Thu Jun 26 17:04:07 2008
@@ -173,7 +173,7 @@
  }
  
  // -------------------------------------------------------------------
-@@ -364,10 +479,40 @@ void SAL_CALL NeonInputStream::truncate( void )
+@@ -364,10 +479,41 @@ void SAL_CALL NeonInputStream::truncate( void )
  }
  
  // -------------------------------------------------------------------
@@ -187,7 +187,8 @@
 +    fprintf( stderr, "WebDAV: RefreshLock() - will refresh in %d sec\n", m_nToExpire - 30 );
 +#endif
 +
-+    --m_nToExpire;
++    if ( m_nToExpire > 0 )
++        --m_nToExpire;
 +
 +    // Refresh the lock if it expires in less than 30 sec
 +    if ( m_pLock && m_nToExpire >= 0 && m_nToExpire < 30 )