kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix linear data npe (#1731) 

* Avoid null point exception
This commit is contained in:
Gao Hongtao 2018-10-08 22:37:22 +08:00 committed by 吴晟 Wu Sheng
parent 363b925ade
commit 46c55ebdb9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicator.java
View File

@ -38,7 +38,7 @@ public abstract class PxxIndicator extends Indicator implements IntValueHolder {
protected static final String VALUE = "value";
protected static final String PRECISION = "precision";
@Getter @Setter @Column(columnName = VALUE) private int value;
@Getter @Setter @Column(columnName = VALUE, isValue = true) private int value;
@Getter @Setter @Column(columnName = PRECISION) private int precision;
@Getter @Setter @Column(columnName = DETAIL_GROUP) private IntKeyLongValueArray detailGroup;

7
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java
View File

@ -89,11 +89,14 @@ public class MetricQueryEsDAO extends EsDAO implements IMetricQueryDAO {
IntValues intValues = new IntValues();
for (MultiGetItemResponse itemResponse : response.getResponses()) {
int value = ((Number)itemResponse.getResponse().getSource().getOrDefault(valueCName, 0)).intValue();
KVInt kvInt = new KVInt();
kvInt.setId(itemResponse.getId());
kvInt.setValue(value);
kvInt.setValue(0);
Map<String, Object> source = itemResponse.getResponse().getSource();
if (source != null) {
kvInt.setValue(((Number)source.getOrDefault(valueCName, 0)).intValue());
}
intValues.getValues().add(kvInt);
}
return intValues;