[bamboo] Automated branch merge (from foundation-2017:6c010e88532dfb0…

…a96353631172c6f4f2f7f4e3b)
OpenNMS · Mar 23, 2017 · dd8583f · dd8583f
2 parents ab7c8a9 + 6c010e8
commit dd8583f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/opennms-model/src/main/java/org/opennms/netmgt/model/OspfElement.java b/opennms-model/src/main/java/org/opennms/netmgt/model/OspfElement.java
@@ -311,7 +311,7 @@ public void merge(OspfElement element) {
 			return;
 		setOspfRouterId(element.getOspfRouterId());
 		setOspfRouterIdIfindex(element.getOspfRouterIdIfindex());
-		setOspfRouterId(element.getOspfRouterIdNetmask());
+		setOspfRouterIdNetmask(element.getOspfRouterIdNetmask());
 
 		setOspfNodeLastPollTime(element.getOspfNodeCreateTime());
 	}