Merge pull request #52 from epics-base/Issue_51

Issue 51

Author: shroffk

pvAccessJava/src/org/epics/pvaccess/client/impl/remote/search/SimpleChannelSearchManagerImpl.java

@@ -418,10 +418,11 @@ private void boost()
 //			for (SearchInstance si : sis)
 //				si.getUserValue().set(BOOST_VALUE);
 //		}
-		
-		for(SearchInstance searchInstance : channels.values()) {
-			searchInstance.getUserValue().set(BOOST_VALUE);
-		}
+        synchronized (channels) {
+            for (SearchInstance searchInstance : channels.values()) {
+                searchInstance.getUserValue().set(BOOST_VALUE);
+            }
+        }
 	}
 
 	@Override
@@ -439,12 +440,12 @@ public void callback() {
 		try 
 		{
 			SearchInstance[] sis;
-			//synchronized (channels) {
+			synchronized (channels) {
 				if (channels.size() == 0)
 					return;
 				sis = new SearchInstance[channels.size()];
 				channels.values().toArray(sis);
-			//}
+			}
 
 			send(sis);
 		}

pvAccessJava/src/org/epics/pvaccess/impl/remote/TransportRegistry.java

@@ -57,14 +57,15 @@ public void put(Transport transport) {
 		// TODO support type
 		final short priority = transport.getPriority();
 		final InetSocketAddress address = transport.getRemoteAddress();
-		Map<Short, Transport> priorities = transports.get(address);
-		if (priorities == null) {
-			priorities = Collections.synchronizedMap(new HashMap<Short, Transport>());
-			transports.put(address, priorities);
-		}
-		priorities.put(priority, transport);
-		allTransports.add(transport);
-
+        synchronized (transports) {
+            Map<Short, Transport> priorities = transports.get(address);
+            if (priorities == null) {
+                priorities = Collections.synchronizedMap(new HashMap<Short, Transport>());
+                transports.put(address, priorities);
+            }
+            priorities.put(priority, transport);
+            allTransports.add(transport);
+        }
 	}
 
 	/**
@@ -78,7 +79,7 @@ public void put(Transport transport) {
 	 *            priority of the transport.
 	 * @return corresponding transport, <code>null</code> if none found.
 	 */
-	public Transport get(String type, InetSocketAddress address, short priority) {
+	public synchronized Transport get(String type, InetSocketAddress address, short priority) {
 		// TODO support type
 		Map<Short, Transport> priorities = transports.get(address);
 		if (priorities != null)
@@ -96,7 +97,7 @@ public Transport get(String type, InetSocketAddress address, short priority) {
 	 *            address of the host computer.
 	 * @return array of corresponding transports, <code>null</code> if none found.
 	 */
-	public Transport[] get(String type, InetSocketAddress address) {
+	public synchronized Transport[] get(String type, InetSocketAddress address) {
 		// TODO support type
 		Map<Short, Transport> priorities = transports.get(address);
 		if (priorities != null) {
@@ -115,7 +116,7 @@ public Transport[] get(String type, InetSocketAddress address) {
 	 *            transport to remove.
 	 * @return removed transport, <code>null</code> if none found.
 	 */
-	public Transport remove(Transport transport) {
+	public synchronized Transport remove(Transport transport) {
 		// TODO support type
 		final short priority = transport.getPriority();
 		final InetSocketAddress address = transport.getRemoteAddress();
@@ -135,7 +136,7 @@ public Transport remove(Transport transport) {
 	/**
 	 * Clear cache.
 	 */
-	public void clear() {
+	public synchronized void clear() {
 
 		transports.clear();
 
@@ -147,7 +148,7 @@ public void clear() {
 	 * 
 	 * @return number of active (cached) transports.
 	 */
-	public int numberOfActiveTransports() {
+	public synchronized int numberOfActiveTransports() {
 
 		return allTransports.size();
 
@@ -160,7 +161,7 @@ public int numberOfActiveTransports() {
 	 *            protocol type (e.g. tcp, udp, ssl, etc.).
 	 * @return array of all active (cached) transports.
 	 */
-	public Transport[] toArray(String type) {
+	public synchronized Transport[] toArray(String type) {
 		// TODO support type
 
 		return allTransports.toArray(new Transport[transports.size()]);
@@ -172,7 +173,7 @@ public Transport[] toArray(String type) {
 	 * 
 	 * @return array of all active (cached) transports.
 	 */
-	public Transport[] toArray() {
+	public synchronized Transport[] toArray() {
 
 		return allTransports.toArray(new Transport[transports.size()]);
 

pvAccessJava/src/org/epics/pvaccess/server/impl/remote/ServerChannelImpl.java

@@ -158,7 +158,7 @@ public Destroyable getRequest(int id) {
 
 	}
 
-	public Destroyable[] getRequests() {
+	public synchronized Destroyable[] getRequests() {
 
 		Destroyable[] reqs = new Destroyable[requests.size()];
 		requests.values().toArray(reqs);

pvAccessJava/src/org/epics/pvaccess/server/impl/remote/tcp/NonBlockingServerTCPTransport.java

@@ -108,12 +108,13 @@ private void destroyAllChannels() {
 
 		context.getLogger().fine("Transport to " + socketAddress + " still has " + channels.size() + " channel(s) active and closing...");
 
-		
-		for(ServerChannel serverChannel : channels.values()) {
-			serverChannel.destroy();
-		}
-		
-		channels.clear();
+        synchronized (channels) {
+            for (ServerChannel serverChannel : channels.values()) {
+                serverChannel.destroy();
+            }
+
+            channels.clear();
+        }
 	}
 
 	/**
@@ -122,13 +123,13 @@ private void destroyAllChannels() {
 	 */
 	public int preallocateChannelSID()
 	{
-		
+		synchronized (channels) {
 			// search first free (theoretically possible loop of death)
 			int sid = lastChannelSID.incrementAndGet();
 			while (channels.containsKey(sid))
 				sid = lastChannelSID.incrementAndGet();
 			return sid;
-		
+		}
 	}
 
 	/**