Merge pull request #55 from epics-base/Issue_53

Issue 53

Author: shroffk

bundleJava/pom.xml

@@ -32,6 +32,21 @@
     <!-- The assembly is built through dependencies, as the regular moduleSet
          does not allow to include sources and javadoc as jars -->
     <dependencies>
+            <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>epics-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>epics-util</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>epics-util</artifactId>
+            <classifier>javadoc</classifier>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>epics-pvdata</artifactId>

epics-core/pom.xml

@@ -15,6 +15,10 @@
     <url>https://github.com/epics-base/epicsCoreJava</url>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>epics-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>epics-pvdata</artifactId>
@@ -30,6 +34,7 @@
         <dependency>
             <groupId>org.epics</groupId>
             <artifactId>jca</artifactId>
+            <version>${jca.version}</version>
         </dependency>
     </dependencies>
 </project>

epics-vtype/vtype/src/main/java/org/epics/vtype/IVEnumArray.java

@@ -5,22 +5,23 @@
 
 import org.epics.util.array.ArrayInteger;
 import org.epics.util.array.ListInteger;
+import org.epics.util.array.ListNumber;
 
 /**
- * Immutable {@code VEnum} implementation.
+ * Immutable {@code VEnumArray} implementation.
  *
  * @author carcassi, shroffk, kasemir
  */
 public class IVEnumArray extends VEnumArray {
 
     private final Alarm alarm;
     private final Time time;
-    private final ListInteger indices;
+    private final ListNumber indices;
     private final EnumDisplay enumDisplay;
 
     private final List<String> labels;
 
-    IVEnumArray(ListInteger indices, EnumDisplay enumDisplay, Alarm alarm, Time time) {
+    IVEnumArray(ListNumber indices, EnumDisplay enumDisplay, Alarm alarm, Time time) {
         VType.argumentNotNull("enumDisplay", enumDisplay);
         this.enumDisplay = enumDisplay;
 
@@ -32,8 +33,8 @@ public class IVEnumArray extends VEnumArray {
         for (int i = 0; i < indices.size(); i++) {
             int index = indices.getInt(i);
             if (index < 0 || index >= enumDisplay.getChoices().size()) {
-                throw new IndexOutOfBoundsException("VEnumArray element " + i + " has index " + index
-                        + " outside of permitted options " + enumDisplay.getChoices());
+                labels.add("VEnumArray element " + i + " has index " + index + " outside of permitted options "
+                        + enumDisplay.getChoices());
             }
             labels.add(enumDisplay.getChoices().get(index));
         }
@@ -63,7 +64,7 @@ public List<String> getData() {
     }
 
     @Override
-    public ListInteger getIndexes() {
+    public ListNumber getIndexes() {
         return indices;
     }
 

epics-vtype/vtype/src/main/java/org/epics/vtype/VEnumArray.java

@@ -3,11 +3,16 @@
 import java.util.List;
 
 import org.epics.util.array.ListInteger;
+import org.epics.util.array.ListNumber;
+import org.epics.util.array.ListShort;
 
+/**
+ * Scalar enum array with alarm, timestamp, and display information.
+ */
 public abstract class VEnumArray extends Array implements AlarmProvider, TimeProvider {
 
     /**
-     * 
+     * Return the enum label values
      */
     @Override
     public abstract List<String> getData();
@@ -17,7 +22,7 @@ public abstract class VEnumArray extends Array implements AlarmProvider, TimePro
      *
      * @return an array of indexes
      */
-    public abstract ListInteger getIndexes();
+    public abstract ListNumber getIndexes();
 
     /** @return the enum display information, i.e. choices */
     public abstract EnumDisplay getDisplay();
@@ -33,4 +38,16 @@ public abstract class VEnumArray extends Array implements AlarmProvider, TimePro
     public static VEnumArray of(ListInteger data, EnumDisplay enumDisplay, Alarm alarm, Time time) {
         return new IVEnumArray(data, enumDisplay, alarm, time);
     }
+
+    /**
+     * Return an instance of the VEnumArray
+     * @param data the indices
+     * @param enumDisplay the enum display labels
+     * @param alarm the alarm
+     * @param time new time
+     * @return {@link VEnumArray} instance of VEnumArray
+     */
+    public static VEnumArray of(ListShort data, EnumDisplay enumDisplay, Alarm alarm, Time time) {
+        return new IVEnumArray(data, enumDisplay, alarm, time);
+    }
 }

pom.xml

@@ -12,6 +12,7 @@
 
     <properties>
         <!-- Matching versions of Core modules -->
+        <epics-util.version>1.0.1-SNAPSHOT</epics-util.version>
         <epics-pvdata.version>6.1.3-SNAPSHOT</epics-pvdata.version>
         <epics-ntypes.version>0.3.3-SNAPSHOT</epics-ntypes.version>
         <epics-pvaccess.version>5.1.3-SNAPSHOT</epics-pvaccess.version>
@@ -142,6 +143,24 @@
         <dependencies>
 
             <!-- EPICS Core Libraries -->
+            <dependency>
+                <groupId>org.epics</groupId>
+                <artifactId>epics-util</artifactId>
+                <version>${epics-util.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.epics</groupId>
+                <artifactId>epics-util</artifactId>
+                <version>${epics-util.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.epics</groupId>
+                <artifactId>epics-util</artifactId>
+                <version>${epics-util.version}</version>
+                <classifier>javadoc</classifier>
+            </dependency>
+
             <dependency>
                 <groupId>org.epics</groupId>
                 <artifactId>epics-pvdata</artifactId>

pvAccessJava/src/org/epics/pvaccess/client/impl/remote/ClientContextImpl.java

@@ -540,22 +540,21 @@ private void internalDestroy() {
 
 	}
 
-	/**
-	 * Destroy all channels.
-	 */
-	private void destroyAllChannels() {
-
-		for (Channel channel : channelsByCID.values()) {
-			try {
-				channel.destroy();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-
-		channelsByCID.clear();
-
-	}
+    /**
+     * Destroy all channels.
+     */
+    private void destroyAllChannels() {
+        synchronized (channelsByCID) {
+            for (Channel channel : channelsByCID.values()) {
+                try {
+                    channel.destroy();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            channelsByCID.clear();
+        }
+    }
 
 	/**
 	 * Check channel name.
@@ -587,7 +586,6 @@ public Channel createChannelInternal(String name, ChannelRequester requester, sh
 		boolean lockAcquired = namedLocker.acquireSynchronizationObject(name, LOCK_TIMEOUT);
 		if (lockAcquired) {
 			try {
-
 				int cid = generateCID();
 				return new ChannelImpl(this, cid, name, requester, priority, addresses);
 			} finally {
@@ -933,18 +931,23 @@ Transport getTransport(TransportClient client, InetSocketAddress serverAddress,
 	 * 
 	 * @return Client channel ID (CID).
 	 */
-	private int generateCID() {
-		// reserve CID
-		channelsByCID.put(lastCID, null);
-		return lastCID;
-	}
+    private int generateCID() {
+        synchronized (channelsByCID) {
+            // reserve CID
+            // search first free (theoretically possible loop of death)
+            while (getChannel(++lastCID) != null)
+                ;
+            // reserve CID
+            channelsByCID.put(lastCID, null);
+            return lastCID;
+        }
+    }
 
 	/**
 	 * Free generated channel ID (CID).
 	 */
 	private void freeCID(int cid) {
 		channelsByCID.remove(cid);
-
 	}
 
 	/**
@@ -954,10 +957,9 @@ private void freeCID(int cid) {
 	 *            I/O ID.
 	 * @return request response with given I/O ID.
 	 */
-	public ResponseRequest getResponseRequest(int ioid) {
-
-		return (ResponseRequest) pendingResponseRequests.get(ioid);
-	}
+    public ResponseRequest getResponseRequest(int ioid) {
+            return (ResponseRequest) pendingResponseRequests.get(ioid);
+    }
 
 	/**
 	 * Register response request.
@@ -967,10 +969,11 @@ public ResponseRequest getResponseRequest(int ioid) {
 	 * @return request ID (IOID).
 	 */
 	public int registerResponseRequest(ResponseRequest request) {
-
-		int ioid = generateIOID();
-		pendingResponseRequests.put(ioid, request);
-		return ioid;
+        synchronized (pendingResponseRequests) {
+            int ioid = generateIOID();
+            pendingResponseRequests.put(ioid, request);
+            return ioid;
+        }
 
 	}
 
@@ -990,15 +993,16 @@ public ResponseRequest unregisterResponseRequest(ResponseRequest request) {
 	 * 
 	 * @return IOID.
 	 */
-	private int generateIOID() {
-
-		// search first free (theoretically possible loop of death)
-		while (pendingResponseRequests.get(++lastIOID) != null || lastIOID == PVAConstants.PVA_INVALID_IOID)
-			;
-		// reserve IOID
-		pendingResponseRequests.put(lastIOID, null);
-		return lastIOID;
-	}
+    private int generateIOID() {
+        synchronized (pendingResponseRequests) {
+            // search first free (theoretically possible loop of death)
+            while (pendingResponseRequests.get(++lastIOID) != null || lastIOID == PVAConstants.PVA_INVALID_IOID)
+                ;
+            // reserve IOID
+            pendingResponseRequests.put(lastIOID, null);
+            return lastIOID;
+        }
+    }
 
 	/**
 	 * Get (and if necessary create) beacon handler.