From bc0c25ad5549635128a1eb54bfb8c1263f6f689b Mon Sep 17 00:00:00 2001
From: tzy1316106836 <1316106836@qq.com>
Date: Thu, 13 Jun 2019 20:23:46 +0800
Subject: [PATCH] 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
---
 .../receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java     | 4 ++--
 .../server/receiver/trace/provider/parser/SegmentParse.java   | 2 +-
 .../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 96b436799..320a63058 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 4d7a7606c..726adb00e 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 565c1cd93..6c18c822a 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;
-- 
GitLab