From 33a801ae5310ed76920cf5d5490d027e6e3f384d Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Mon, 22 Oct 2012 06:32:23 +0000
Subject: [PATCH] Adds a check for force shutdown timeout system property.

---
 .../communicator/impl/shutdowntimeout/ShutdownTimeout.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/net/java/sip/communicator/impl/shutdowntimeout/ShutdownTimeout.java b/src/net/java/sip/communicator/impl/shutdowntimeout/ShutdownTimeout.java
index ea8cac8e1..e221c0fc1 100644
--- a/src/net/java/sip/communicator/impl/shutdowntimeout/ShutdownTimeout.java
+++ b/src/net/java/sip/communicator/impl/shutdowntimeout/ShutdownTimeout.java
@@ -93,8 +93,13 @@ public void run()
                             if(shutdownCustomValue != null
                                 && shutdownCustomValue.length() > 0)
                             {
-                                shutDownTimeout =
+                                long custom =
                                     Long.valueOf(shutdownCustomValue);
+
+                                // make sure custom is not 0, or it will
+                                // wait forever
+                                if(custom > 0)
+                                    shutDownTimeout = custom;
                             }
                         }
                         catch(Throwable t){}