Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
8c8873e4f4
1 changed files with 3 additions and 2 deletions
|
@ -91,8 +91,9 @@ public class RoutingConfiguration {
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getAttribute(VehicleRouter router, String propertyName) {
|
private String getAttribute(VehicleRouter router, String propertyName) {
|
||||||
if (router.containsAttribute(propertyName)) {
|
String attr = router.getAttribute(propertyName);
|
||||||
return router.getAttribute(propertyName);
|
if (attr != null) {
|
||||||
|
return attr;
|
||||||
}
|
}
|
||||||
return attributes.get(propertyName);
|
return attributes.get(propertyName);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue