killbill-uncached

util: fix potential NPE in InternalCallContextFactory Signed-off-by: …

3/27/2017 8:26:32 AM

Pierre-Alexandre Meyer <pierre@mouraf.org>

Pierre-Alexandre Meyer

Commit: 2ff0650

Tree: 2babee0

Parents: 4dc99af

Changes

util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java 3(+2 -1)

Details

util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java 3(+2 -1)

diff --git a/util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java b/util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java
index 5be0ad0..ffee721 100644
--- a/util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java
+++ b/util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java
@@ -43,7 +43,8 @@ import com.google.common.base.MoreObjects;
 // Internal contexts almost always expect accountRecordId and tenantRecordId to be populated
 public class InternalCallContextFactory {
 
-    public static final long INTERNAL_TENANT_RECORD_ID = 0L;
+    // Long, not long, to avoid NPE with ==
+    public static final Long INTERNAL_TENANT_RECORD_ID = 0L;
 
     public static final String MDC_KB_ACCOUNT_RECORD_ID = "kb.accountRecordId";
     public static final String MDC_KB_TENANT_RECORD_ID = "kb.tenantRecordId";