Skip to content

Commit b624820

Browse files
authored
Merge pull request #7 from ControlSystemStudio/fix_default_protocol
Change order when setting EPICS preferences
2 parents 07d6b70 + 593affc commit b624820

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/main/java/org/phoebus/pvws/EpicsConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ public class EpicsConfiguration {
6565
public void init() {
6666
logger.log(Level.INFO, "===========================================");
6767
logger.log(Level.INFO, contextPath + " started");
68-
logger.log(Level.INFO, "Supported PV types: " + PVPool.getSupportedPrefixes());
69-
7068
// Set default type in preferences before PVPool reads the preferences
7169
String default_type = System.getenv("PV_DEFAULT_TYPE");
7270
if (default_type != null && !default_type.isEmpty()) {
@@ -77,6 +75,7 @@ else if (pvDefaultType != null && !pvDefaultType.isEmpty()) {
7775
Preferences.userRoot().node("/org/phoebus/pv").put("default", pvDefaultType);
7876
}
7977
logger.log(Level.INFO, "PV_DEFAULT_TYPE=" + Preferences.userRoot().node("/org/phoebus/pv").get("default", null));
78+
logger.log(Level.INFO, "Supported PV types: " + PVPool.getSupportedPrefixes());
8079

8180
Preferences.userRoot().node("/org/phoebus/pv/pva").put("epics_pva_addr_list", epicsPvaAddrList);
8281

0 commit comments

Comments
 (0)