Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-07-23 12:04:49 +02:00
commit 8c8873e4f4

View file

@ -91,8 +91,9 @@ public class RoutingConfiguration {
}
private String getAttribute(VehicleRouter router, String propertyName) {
if (router.containsAttribute(propertyName)) {
return router.getAttribute(propertyName);
String attr = router.getAttribute(propertyName);
if (attr != null) {
return attr;
}
return attributes.get(propertyName);
}