metrics related NPE when debug=false

closes #154
jpos · Mar 12, 2018 · eb5c1f6 · eb5c1f6
1 parent aa4c66f
commit eb5c1f6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/jpos/src/main/java/org/jpos/transaction/TransactionManager.java b/jpos/src/main/java/org/jpos/transaction/TransactionManager.java
@@ -259,7 +259,7 @@ public void run () {
                         abort   = pt.isAborting();
                         evt     = pt.getLogEvent();
                         prof    = pt.getProfiler();
-                        if (metrics != null)
+                        if (metrics != null && prof != null)
                             metrics.record(getName(pt.getParticipant()) + "-resume", prof.getPartialInMillis());
                         if (prof != null)
                             prof.reenable();
@@ -436,7 +436,8 @@ public void setConfiguration (Configuration cfg)
                 throw new ConfigurationException("max-active-sessions < max-sessions");
         }
         callSelectorOnAbort = cfg.getBoolean("call-selector-on-abort", true);
-        metrics = new Metrics(new AtomicHistogram(cfg.getLong("metrics-highest-trackable-value", 60000), 2));
+        if (profiler)
+            metrics = new Metrics(new AtomicHistogram(cfg.getLong("metrics-highest-trackable-value", 60000), 2));
     }
     public void addListener (TransactionStatusListener l) {
         synchronized (statusListeners) {