Merge pull request #98 from epics-base/release/7.0

Release/7.0

Author: shroffk

pvAccessJava/src/org/epics/ca/BaseV3ChannelStructure.java

@@ -227,11 +227,10 @@ public PVStructure createPVStructure(PVStructure pvRequest,boolean propertiesAll
                 nativeDBRType = DBRType.STRING;
             }
         }
-        String[] propertyNames = new String[propertyList.size()];
-        for(int i=0; i<propertyNames.length; i++) propertyNames[i] = propertyList.get(i);
+        
         DBRProperty dbrProperty = DBRProperty.none;
-        if(propertyNames.length>0) {
-            for(String propertyName : propertyNames) {
+        if(propertyList.size()>0) {
+            for(String propertyName : propertyList) {
                 if(propertyName.equals("alarm")&& (dbrProperty.compareTo(DBRProperty.status)<0)) {
                     dbrProperty = DBRProperty.status;
                     continue;
@@ -958,15 +957,18 @@ public void toStructure(DBR fromDBR) {
             String message = status.getName();
             setAlarm(statusMap.get(status),alarmSeverity,message);
         }
-        if(displayLow<displayHigh) {
+        if(units!=null) {
             pvStructure = this.pvStructure.getStructureField("display");
             if(pvStructure!=null) {
-                if(units!=null) {
                     PVString pvUnits = pvStructure.getStringField("units");
                     if(pvUnits!=null) {
                         pvUnits.put(units.toString());
                     }
                 }
+        }
+        if(displayLow<displayHigh) {
+            pvStructure = this.pvStructure.getStructureField("display");
+            if(pvStructure!=null) {
                 PVDouble pvLow = pvStructure.getDoubleField("limitLow");
                 PVDouble pvHigh = pvStructure.getDoubleField("limitHigh");
                 if(pvLow!=null && pvHigh!=null) {