// Copyright 2015 The Project Buendia Authors
//
// Licensed under the Apache License, Version 2.0 (the "License"); you may not
// use this file except in compliance with the License.  You may obtain a copy
// of the License at: http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software distrib-
// uted under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
// OR CONDITIONS OF ANY KIND, either express or implied.  See the License for
// specific language governing permissions and limitations under the License.

package org.projectbuendia.client.sync;

import android.app.Service;
import android.content.Intent;
import android.os.IBinder;

/** A service that holds a singleton SyncAdapter and provides it to the OS on request. */
public class SyncAdapterService extends Service {

    private static SyncAdapter sInstance = null;
    private static final Object sLock = new Object();

    @Override
    public void onCreate() {
        super.onCreate();
        if (sInstance == null) {
            synchronized (sLock) {
                if (sInstance == null) {
                    sInstance = new SyncAdapter(getApplicationContext(), true);
                }
            }
        }
    }

    @Override
    public IBinder onBind(Intent intent) {
        return sInstance.getSyncAdapterBinder();
    }
}

@@ -867,23 +867,16 @@
 private 
-static 
 SyncAdap
@@ -883,78 +883,27 @@
 ter 
-sInstance = null;%0A    private static final Object sLock = new Object()
+mSyncAdapter = null
 ;%0A%0A 
@@ -982,138 +982,20 @@
     
-if (sInstance == null) %7B%0A            synchronized (sLock) %7B%0A                if (sInstance == null) %7B%0A                    sInstance
+mSyncAdapter
  = n
@@ -1045,50 +1045,8 @@
 e);%0A
-                %7D%0A            %7D%0A        %7D%0A
     
@@ -1124,17 +1124,20 @@
 urn 
-sInstance
+mSyncAdapter
 .get

Remove singleton pattern from within SyncAdapterService.