the static paramater is best to be referenced by the class (apache#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
albon · Jun 13, 2019 · bc0c25a · bc0c25a
1 parent c3de8e8
commit bc0c25a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...va/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java b/...va/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java
@@ -175,7 +175,7 @@ protected List<Source> analysisSideCar(StreamAccessLogsMessage.Identifier identi
                 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 @@ protected void analysisProxy(StreamAccessLogsMessage.Identifier identifier,
                 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/...in/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParse.java b/...in/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParse.java
@@ -275,7 +275,7 @@ public void send(UpstreamSegment segment, Source source) {
             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/.../java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParseV2.java b/.../java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParseV2.java
@@ -275,7 +275,7 @@ public void send(UpstreamSegment segment, SegmentSource source) {
             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;