瀏覽代碼

Tidy up fillInStackTrace implementations (#62555)

Removes the unnecessary `synchronized` introduced in #62433 and adjusts
the others to return `this` not `null` as required by the parent
method's Javadocs.
David Turner 5 年之前
父節點
當前提交
45e32e32b3

+ 1 - 1
server/src/main/java/org/elasticsearch/cluster/NotMasterException.java

@@ -41,6 +41,6 @@ public class NotMasterException extends ElasticsearchException {
 
     @Override
     public Throwable fillInStackTrace() {
-        return null;
+        return this;
     }
 }

+ 1 - 1
server/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java

@@ -59,7 +59,7 @@ public class VersionConflictEngineException extends EngineException {
     }
 
     @Override
-    public synchronized Throwable fillInStackTrace() {
+    public Throwable fillInStackTrace() {
         // This is on the hot path for updates; stack traces are expensive to compute and not very useful for VCEEs, so don't fill it in.
         return this;
     }

+ 1 - 1
server/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java

@@ -38,6 +38,6 @@ public class NodeDisconnectedException extends ConnectTransportException {
 
     @Override
     public Throwable fillInStackTrace() {
-        return null;
+        return this;
     }
 }

+ 1 - 1
server/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java

@@ -31,7 +31,7 @@ public class NotSerializableTransportException extends TransportException {
 
     @Override
     public Throwable fillInStackTrace() {
-        return null;
+        return this;
     }
 
 }

+ 0 - 3
server/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java

@@ -34,7 +34,4 @@ public class ReceiveTimeoutTransportException extends ActionTransportException {
         super(in);
     }
 
-//    @Override public Throwable fillInStackTrace() {
-//        return fillStack();
-//    }
 }

+ 1 - 1
server/src/main/java/org/elasticsearch/transport/RemoteTransportException.java

@@ -48,6 +48,6 @@ public class RemoteTransportException extends ActionTransportException implement
     @Override
     public Throwable fillInStackTrace() {
         // no need for stack trace here, we always have cause
-        return null;
+        return this;
     }
 }

+ 1 - 1
server/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java

@@ -38,6 +38,6 @@ public class ResponseHandlerFailureTransportException extends TransportException
 
     @Override
     public Throwable fillInStackTrace() {
-        return null;
+        return this;
     } // why is this?
 }