Skip to content

Commit cb30b56

Browse files
committed
fix: potential NPE
Signed-off-by: Chris Laprun <metacosm@gmail.com>
1 parent 08d8a58 commit cb30b56

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ResourceEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
public class ResourceEvent extends Event {
2727

28-
protected final ResourceAction action;
29-
protected final HasMetadata resource;
28+
private final ResourceAction action;
29+
private final HasMetadata resource;
3030

3131
public ResourceEvent(ResourceAction action, ResourceID resourceID, HasMetadata resource) {
3232
super(resourceID);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ExtendedResourceEvent.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,10 @@ public Optional<HasMetadata> getPreviousResource() {
4444
@Override
4545
public String toString() {
4646
return "ExtendedResourceEvent{"
47-
+ "previousResourceVersion="
48-
+ previousResource.getMetadata().getResourceVersion()
47+
+ getPreviousResource().map(r -> "previousResourceVersion=" + r.getMetadata().getResourceVersion()).orElse("")
4948
+ ", action="
50-
+ action
51-
+ ", resourceVersion="
52-
+ resource.getMetadata().getResourceVersion()
49+
+ getAction()
50+
+ getResource().map(r -> ", resourceVersion=" + r.getMetadata().getResourceVersion()).orElse("")
5351
+ ", relatedCustomResourceName="
5452
+ relatedCustomResource.getName()
5553
+ '}';

0 commit comments

Comments
 (0)