You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/06/13 12:23:54 UTC
[skywalking] branch master updated: the static paramater is best to
be referenced by the class (#2868)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new bc0c25a the static paramater is best to be referenced by the class (#2868)
bc0c25a is described below
commit bc0c25ad5549635128a1eb54bfb8c1263f6f689b
Author: tzy1316106836 <13...@qq.com>
AuthorDate: Thu Jun 13 20:23:46 2019 +0800
the static paramater is best to be referenced by the class (#2868)
* fix potential NullPointerException
* Revert "fix potential NullPointerException"
This reverts commit 8393656
* fix potential NullPointerException
the static paramater is best to use the class to reference
---
.../oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java | 4 ++--
.../oap/server/receiver/trace/provider/parser/SegmentParse.java | 2 +-
.../oap/server/receiver/trace/provider/parser/SegmentParseV2.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java
index 96b4367..320a630 100644
--- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java
+++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java
@@ -175,7 +175,7 @@ public class K8sALSServiceMeshHTTPAnalysis implements ALSHTTPAnalysis {
if (request != null) {
endpoint = request.getPath();
String schema = request.getScheme();
- if (schema.equals("http") || schema.equals("https")) {
+ if ("http".equals(schema) || "https".equals(schema)) {
protocol = Protocol.HTTP;
} else {
protocol = Protocol.gRPC;
@@ -278,7 +278,7 @@ public class K8sALSServiceMeshHTTPAnalysis implements ALSHTTPAnalysis {
if (request != null) {
endpoint = request.getPath();
String schema = request.getScheme();
- if (schema.equals("http") || schema.equals("https")) {
+ if ("http".equals(schema) || "https".equals(schema)) {
protocol = Protocol.HTTP;
} else {
protocol = Protocol.gRPC;
diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParse.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParse.java
index 4d7a760..726adb0 100644
--- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParse.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParse.java
@@ -275,7 +275,7 @@ public class SegmentParse {
segmentParse.setStandardizationWorker(standardizationWorker);
boolean parseResult = segmentParse.parse(bufferData, Source.Buffer);
if (parseResult) {
- segmentParse.TRACE_BUFFER_FILE_OUT.inc();
+ TRACE_BUFFER_FILE_OUT.inc();
}
return parseResult;
diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParseV2.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParseV2.java
index 565c1cd..6c18c82 100644
--- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParseV2.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParseV2.java
@@ -275,7 +275,7 @@ public class SegmentParseV2 {
segmentParse.setStandardizationWorker(standardizationWorker);
boolean parseResult = segmentParse.parse(bufferData, SegmentSource.Buffer);
if (parseResult) {
- segmentParse.TRACE_BUFFER_FILE_OUT.inc();
+ TRACE_BUFFER_FILE_OUT.inc();
}
return parseResult;