commit ef102a4dae8fdd80bad888c702c35647723d0009
author Linux Build Service Account <lnxbuild@localhost> Thu Dec 05 05:44:54 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Dec 05 05:44:54 2013 -0800
tree c47e47115ca3065093db38fdda4186fce99e94f9
parent d5a045b9bcb3f5e052cd1a8a1c6d3827c04b059c
parent 80c826c79261fcef5a0c17a68873636586d503fd

Merge "FTP: Handle null pointer exception for socket accept thread synchronize."

src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java

diff --git a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
index 45c5440..5a55476 100644
--- a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
+++ b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
@@ -451,13 +451,8 @@
     private final void closeService() {
         if (VERBOSE) Log.v(TAG, "Ftp Service closeService");
 
-        if (mServerSession != null) {
-            mServerSession.close();
-            mServerSession = null;
-        }
-
         try {
-            closeRfcommSocket(true, true);
+            closeRfcommSocket(true, false);
         } catch (IOException ex) {
             Log.e(TAG, "CloseSocket error: " + ex);
         }
@@ -472,6 +467,17 @@
             }
         }
 
+        try {
+            closeRfcommSocket(false, true);
+        } catch (IOException ex) {
+            Log.e(TAG, "CloseSocket error: " + ex);
+        }
+
+        if (mServerSession != null) {
+            mServerSession.close();
+            mServerSession = null;
+        }
+
         mHasStarted = false;
         if (stopSelfResult(mStartId)) {
             if (VERBOSE) Log.v(TAG, "successfully stopped ftp service");
@@ -589,8 +595,14 @@
                 try {
                     Log.v(RTAG,"Run Accept thread");
                     mConnSocket = mRfcommServerSocket.accept();
-                    isL2capSocket = false;
-                    mRemoteDevice = mConnSocket.getRemoteDevice();
+                    synchronized(BluetoothFtpService.this) {
+                        if(mConnSocket == null){
+                            Log.i(RTAG, "mConnSocket = null");
+                            break;
+                        }
+                        isL2capSocket = false;
+                        mRemoteDevice = mConnSocket.getRemoteDevice();
+                    }
                     if (mRemoteDevice == null) {
                         Log.i(RTAG, "getRemoteDevice() = null");
                         break;