Fixing bug that caused units not being retrieved under certain circum… · epics-base/epicsCoreJava@f894814 · GitHub

1. epics-base
2. epicsCoreJava

Repository navigation

• Code
• Issues28 (28)
• Pull requests2 (2)
• Actions
• Security and quality
• Insights

Commit f894814

Browse filesBrowse the repository at this point in the historyBrowse files

juanfem

committed

Fixing bug that caused units not being retrieved under certain circumstances.

1 parent 669b241 commit f894814
Copy full SHA for f894814

1 file changed

+8-6Lines changed: 8 additions & 6 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

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

Expand file treeCollapse file tree

Open diff view settings

Collapse file

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

Copy file name to clipboardExpand all lines: pvAccessJava/src/org/epics/ca/BaseV3ChannelStructure.java

+8-6Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -220,11 +220,10 @@ public PVStructure createPVStructure(PVStructure pvRequest,boolean propertiesAll
220	220	nativeDBRType = DBRType.STRING;
221	221	}
222	222	}
223		- String[] propertyNames = new String[propertyList.size()];
224		- for(int i=0; i<propertyNames.length; i++) propertyNames[i] = propertyList.get(i);
	223	+
225	224	DBRProperty dbrProperty = DBRProperty.none;
226		- if(propertyNames.length>0) {
227		- for(String propertyName : propertyNames) {
	225	+ if(propertyList.size()>0) {
	226	+ for(String propertyName : propertyList) {
228	227	if(propertyName.equals("alarm")&& (dbrProperty.compareTo(DBRProperty.status)<0)) {
229	228	dbrProperty = DBRProperty.status;
230	229	continue;
@@ -911,15 +910,18 @@ public void toStructure(DBR fromDBR) {
911	910	String message = status.getName();
912	911	setAlarm(statusMap.get(status),alarmSeverity,message);
913	912	}
914		- if(displayLow<displayHigh) {
	913	+ if(units!=null) {
915	914	pvStructure = this.pvStructure.getStructureField("display");
916	915	if(pvStructure!=null) {
917		- if(units!=null) {
918	916	PVString pvUnits = pvStructure.getStringField("units");
919	917	if(pvUnits!=null) {
920	918	pvUnits.put(units.toString());
921	919	}
922	920	}
	921	+ }
	922	+ if(displayLow<displayHigh) {
	923	+ pvStructure = this.pvStructure.getStructureField("display");
	924	+ if(pvStructure!=null) {
923	925	PVDouble pvLow = pvStructure.getDoubleField("limitLow");
924	926	PVDouble pvHigh = pvStructure.getDoubleField("limitHigh");
925	927	if(pvLow!=null && pvHigh!=null) {

0 commit comments

Comments

0 (0)