Don't call System.exit() when exiting the application since that kills the Felix shutdown thread and causes various problems such as incomplete contact list file.

src/net/java/sip/communicator/impl/gui/main/MainFrame.java

@@ -632,9 +632,15 @@ public void windowClosed(WindowEvent e) {
             try {
                 GuiActivator.bundleContext.getBundle(0).stop();
             } catch (BundleException ex) {
-                logger.error("Failed to gently shutdown Oscar", ex);
+                logger.error("Failed to gently shutdown Felix", ex);
+                System.exit(0);
             }
-            System.exit(0);
+            //stopping a bundle doesn't leave the time to the felix thread to
+            //properly end all bundles and call their Activator.stop() methods.
+            //if this causes problems don't uncomment the following line but
+            //try and see why felix isn't exiting (suggesting: is it running
+            //in embedded mode?)
+            //System.exit(0);
         }
     }
 

src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java

@@ -57,12 +57,12 @@ public class WelcomeWindow
     public WelcomeWindow(CommunicatorMain c,
             LoginManager loginManager) {
         super(c.getMainFrame());
-        
+
         this.communicator = c;
         this.loginManager = loginManager;
 
         this.setTitle(Messages.getString("warning"));
-        
+
         this.exitButton.setMnemonic(
                 Messages.getString("mnemonic.exit").charAt(0));
         this.continueButton.setMnemonic(
@@ -179,9 +179,16 @@ public void actionPerformed(ActionEvent e) {
             try {
                 GuiActivator.bundleContext.getBundle(0).stop();
             } catch (BundleException ex) {
-                logger.error("Failed to gently shutdown Oscar", ex);
+                logger.error("Failed to gently shutdown Felix", ex);
+                System.exit(0);
             }
-            System.exit(0);
+            //stopping a bundle doesn't leave the time to the felix thread to
+            //properly end all bundles and call their Activator.stop() methods.
+            //if this causes problems don't uncomment the following line but
+            //try and see why felix isn't exiting (suggesting: is it running
+            //in embedded mode?)
+            //System.exit(0);
+
         }
     }
 

src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java

@@ -137,10 +137,16 @@ else if (itemName.equals("close")) {
             try {
                 GuiActivator.bundleContext.getBundle(0).stop();
             } catch (BundleException ex) {
-                logger.error("Failed to gently shutdown Oscar", ex);
+                logger.error("Failed to gently shutdown Felix", ex);
+                System.exit(0);
             }
             parentWindow.dispose();
-            System.exit(0);
+            //stopping a bundle doesn't leave the time to the felix thread to
+            //properly end all bundles and call their Activator.stop() methods.
+            //if this causes problems don't uncomment the following line but
+            //try and see why felix isn't exiting (suggesting: is it running
+            //in embedded mode?)
+            //System.exit(0);
         }
     }
 }