/**
 * Copyright (c) 2002-2013 "Neo Technology,"
 * Network Engine for Objects in Lund AB [http://neotechnology.com]
 *
 * This file is part of Neo4j.
 *
 * Neo4j is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as
 * published by the Free Software Foundation, either version 3 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Affero General Public License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
package org.neo4j.cluster.statemachine;

import java.net.URI;

import org.neo4j.cluster.BindingListener;

/**
 * Generate id's for state machine conversations. This should be shared between all state machines in a server.
 * <p/>
 * These conversation id's can be used to uniquely identify conversations between distributed state machines.
 */
public class StateMachineConversations
        implements BindingListener
{
    private long nextConversationId = 0;
    private String serverId;

    public synchronized String getNextConversationId()
    {
        return serverId + "/" + (nextConversationId++) + "#";
    }

    @Override
    public void listeningAt( URI me )
    {
        serverId = me.toString();
    }
}

@@ -871,16 +871,63 @@
 net.URI;
+%0Aimport java.util.concurrent.atomic.AtomicLong;
 %0A%0Aimport
@@ -1289,17 +1289,23 @@
 private 
-l
+AtomicL
 ong next
@@ -1321,17 +1321,32 @@
 ionId = 
-0
+new AtomicLong()
 ;%0A    pr
@@ -1384,21 +1384,8 @@
 lic 
-synchronized 
 Stri
@@ -1449,17 +1449,16 @@
 + %22/%22 + 
-(
 nextConv
@@ -1471,10 +1471,25 @@
 onId
-++
+.incrementAndGet(
 ) + 

Replace synchronized with AtomicLong