Merge pull request #196 from entur/system-mapper-npe

Fix NPE in SystemMapper
entur · Aug 3, 2023 · 1d89afa · 1d89afa
2 parents d2001d9 + ad21614
commit 1d89afa
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/entur/lamassu/mapper/entitymapper/SystemMapper.java b/src/main/java/org/entur/lamassu/mapper/entitymapper/SystemMapper.java
@@ -87,7 +87,11 @@ public System mapSystem(GBFSData systemInformation, FeedProvider feedProvider) {
     system.setPhoneNumber(systemInformation.getPhoneNumber());
     system.setEmail(systemInformation.getEmail());
     system.setFeedContactEmail(system.getFeedContactEmail());
-    system.setTimezone(systemInformation.getTimezone().value());
+    system.setTimezone(
+      systemInformation.getTimezone() != null
+        ? systemInformation.getTimezone().value()
+        : null
+    );
     system.setLicenseUrl(systemInformation.getLicenseUrl());
     system.setBrandAssets(mapBrandAssets(systemInformation.getBrandAssets()));
     system.setTermsUrl(systemInformation.getTermsUrl());