Skip to content

Commit 0fb218d

Browse files
cp3fantasyluyiisme
authored andcommitted
fix npe (#45)
* fix LookoutBucketCounter npe
1 parent 54518a3 commit 0fb218d

File tree

13 files changed

+16
-13
lines changed

13 files changed

+16
-13
lines changed

client/lookout-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.alipay.sofa.lookout</groupId>
77
<artifactId>lookout-client-parent</artifactId>
8-
<version>1.5.2-SNAPSHOT</version>
8+
<version>1.5.2</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

client/lookout-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.alipay.sofa.lookout</groupId>
88
<artifactId>lookout-client-parent</artifactId>
9-
<version>1.5.2-SNAPSHOT</version>
9+
<version>1.5.2</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

client/lookout-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.alipay.sofa.lookout</groupId>
88
<artifactId>lookout-client-parent</artifactId>
9-
<version>1.5.2-SNAPSHOT</version>
9+
<version>1.5.2</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

client/lookout-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.alipay.sofa.lookout</groupId>
88
<artifactId>lookout-client-parent</artifactId>
9-
<version>1.5.2-SNAPSHOT</version>
9+
<version>1.5.2</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

client/lookout-ext-jvm/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.alipay.sofa.lookout</groupId>
88
<artifactId>lookout-client-parent</artifactId>
9-
<version>1.5.2-SNAPSHOT</version>
9+
<version>1.5.2</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

client/lookout-ext-os/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.alipay.sofa.lookout</groupId>
77
<artifactId>lookout-client-parent</artifactId>
8-
<version>1.5.2-SNAPSHOT</version>
8+
<version>1.5.2</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

client/lookout-reg-dropwizard/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.alipay.sofa.lookout</groupId>
88
<artifactId>lookout-client-parent</artifactId>
9-
<version>1.5.2-SNAPSHOT</version>
9+
<version>1.5.2</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

client/lookout-reg-prometheus/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.alipay.sofa.lookout</groupId>
88
<artifactId>lookout-client-parent</artifactId>
9-
<version>1.5.2-SNAPSHOT</version>
9+
<version>1.5.2</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

client/lookout-reg-server/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.alipay.sofa.lookout</groupId>
88
<artifactId>lookout-client-parent</artifactId>
9-
<version>1.5.2-SNAPSHOT</version>
9+
<version>1.5.2</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

client/lookout-reg-server/src/main/java/com/alipay/lookout/remote/step/LookoutBucketCounter.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ private void roll() {
101101

102102
public Iterator<Metric> iterator() {
103103

104+
if (buckets == null) {
105+
return null;
106+
}
107+
104108
roll();
105109

106110
return new Iterator<Metric>() {
@@ -144,7 +148,6 @@ public void remove() {
144148
class BucketMetric implements Metric {
145149

146150
Id id;
147-
148151
long count;
149152

150153
public BucketMetric(int i) {

client/lookout-sofa-boot-starter/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.alipay.sofa.lookout</groupId>
88
<artifactId>lookout-client-parent</artifactId>
9-
<version>1.5.2-SNAPSHOT</version>
9+
<version>1.5.2</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alipay.sofa.lookout</groupId>
77
<artifactId>lookout-client-parent</artifactId>
8-
<version>1.5.2-SNAPSHOT</version>
8+
<version>1.5.2</version>
99
<packaging>pom</packaging>
1010
<name>${project.groupId}:${project.artifactId}</name>
1111
<description>It is a library which allows you to instrument your app with custom metrics</description>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.alipay.sofa.lookout</groupId>
66
<artifactId>lookout-parent</artifactId>
7-
<version>1.5.2-SNAPSHOT</version>
7+
<version>1.5.2</version>
88
<packaging>pom</packaging>
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

0 commit comments

Comments
 (0)