This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/main by this push:
new 419f3c7b Catch null pointer exception server resources (#638)
419f3c7b is described below
commit 419f3c7b2b025007fc37985bc403aa2dad4c0da5
Author: Leonard <[email protected]>
AuthorDate: Fri Apr 28 17:31:48 2023 +0200
Catch null pointer exception server resources (#638)
---
.../src/main/java/org/apache/baremaps/server/DevResources.java | 2 +-
.../src/main/java/org/apache/baremaps/server/GeocoderResources.java | 2 +-
.../src/main/java/org/apache/baremaps/server/IplocResources.java | 2 +-
.../src/main/java/org/apache/baremaps/server/ServerResources.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/baremaps-server/src/main/java/org/apache/baremaps/server/DevResources.java
b/baremaps-server/src/main/java/org/apache/baremaps/server/DevResources.java
index 2a5d4ba2..1e3a5e7f 100644
--- a/baremaps-server/src/main/java/org/apache/baremaps/server/DevResources.java
+++ b/baremaps-server/src/main/java/org/apache/baremaps/server/DevResources.java
@@ -158,7 +158,7 @@ public class DevResources {
try (InputStream inputStream =
getClass().getClassLoader().getResourceAsStream(path)) {
var bytes = inputStream.readAllBytes();
return Response.ok().entity(bytes).build();
- } catch (IOException e) {
+ } catch (NullPointerException | IOException e) {
return Response.status(404).build();
}
}
diff --git
a/baremaps-server/src/main/java/org/apache/baremaps/server/GeocoderResources.java
b/baremaps-server/src/main/java/org/apache/baremaps/server/GeocoderResources.java
index 3422f5d2..bfb5a995 100644
---
a/baremaps-server/src/main/java/org/apache/baremaps/server/GeocoderResources.java
+++
b/baremaps-server/src/main/java/org/apache/baremaps/server/GeocoderResources.java
@@ -104,7 +104,7 @@ public class GeocoderResources {
try (InputStream inputStream =
getClass().getClassLoader().getResourceAsStream(path)) {
var bytes = inputStream.readAllBytes();
return Response.ok().entity(bytes).build();
- } catch (IOException e) {
+ } catch (NullPointerException | IOException e) {
return Response.status(404).build();
}
}
diff --git
a/baremaps-server/src/main/java/org/apache/baremaps/server/IplocResources.java
b/baremaps-server/src/main/java/org/apache/baremaps/server/IplocResources.java
index 313b20d7..41645750 100644
---
a/baremaps-server/src/main/java/org/apache/baremaps/server/IplocResources.java
+++
b/baremaps-server/src/main/java/org/apache/baremaps/server/IplocResources.java
@@ -67,7 +67,7 @@ public class IplocResources {
try (InputStream inputStream =
getClass().getClassLoader().getResourceAsStream(path)) {
var bytes = inputStream.readAllBytes();
return Response.ok().entity(bytes).build();
- } catch (IOException e) {
+ } catch (NullPointerException | IOException e) {
return Response.status(404).build();
}
}
diff --git
a/baremaps-server/src/main/java/org/apache/baremaps/server/ServerResources.java
b/baremaps-server/src/main/java/org/apache/baremaps/server/ServerResources.java
index b22b8c67..89fca491 100644
---
a/baremaps-server/src/main/java/org/apache/baremaps/server/ServerResources.java
+++
b/baremaps-server/src/main/java/org/apache/baremaps/server/ServerResources.java
@@ -112,7 +112,7 @@ public class ServerResources {
try (InputStream inputStream =
getClass().getClassLoader().getResourceAsStream(path)) {
var bytes = inputStream.readAllBytes();
return Response.ok().entity(bytes).build();
- } catch (IOException e) {
+ } catch (NullPointerException | IOException e) {
return Response.status(404).build();
}
}