fix npe (#45)

* fix LookoutBucketCounter npe
sofastack · Oct 23, 2018 · 0fb218d · 0fb218d
1 parent 54518a3
commit 0fb218d
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 13 deletions.
diff --git a/client/lookout-api/pom.xml b/client/lookout-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa.lookout</groupId>
         <artifactId>lookout-client-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/client/lookout-client/pom.xml b/client/lookout-client/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa.lookout</groupId>
         <artifactId>lookout-client-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/client/lookout-common/pom.xml b/client/lookout-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa.lookout</groupId>
         <artifactId>lookout-client-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/client/lookout-core/pom.xml b/client/lookout-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa.lookout</groupId>
         <artifactId>lookout-client-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/client/lookout-ext-jvm/pom.xml b/client/lookout-ext-jvm/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa.lookout</groupId>
         <artifactId>lookout-client-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/client/lookout-ext-os/pom.xml b/client/lookout-ext-os/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa.lookout</groupId>
         <artifactId>lookout-client-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/client/lookout-reg-dropwizard/pom.xml b/client/lookout-reg-dropwizard/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa.lookout</groupId>
         <artifactId>lookout-client-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/client/lookout-reg-prometheus/pom.xml b/client/lookout-reg-prometheus/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa.lookout</groupId>
         <artifactId>lookout-client-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/client/lookout-reg-server/pom.xml b/client/lookout-reg-server/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa.lookout</groupId>
         <artifactId>lookout-client-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...lookout-reg-server/src/main/java/com/alipay/lookout/remote/step/LookoutBucketCounter.java b/...lookout-reg-server/src/main/java/com/alipay/lookout/remote/step/LookoutBucketCounter.java
@@ -101,6 +101,10 @@ private void roll() {
 
     public Iterator<Metric> iterator() {
 
+        if (buckets == null) {
+            return null;
+        }
+
         roll();
 
         return new Iterator<Metric>() {
@@ -144,7 +148,6 @@ public void remove() {
     class BucketMetric implements Metric {
 
         Id   id;
-
         long count;
 
         public BucketMetric(int i) {

diff --git a/client/lookout-sofa-boot-starter/pom.xml b/client/lookout-sofa-boot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa.lookout</groupId>
         <artifactId>lookout-client-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/client/pom.xml b/client/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alipay.sofa.lookout</groupId>
     <artifactId>lookout-client-parent</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.5.2</version>
     <packaging>pom</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>It is a library which allows you to instrument your app with custom metrics</description>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alipay.sofa.lookout</groupId>
     <artifactId>lookout-parent</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.5.2</version>
     <packaging>pom</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>