fix sonar

apache · Mar 12, 2020 · 351cb50 · 351cb50
1 parent 5bb734b
commit 351cb50
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/...er/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithoutValueFilter.java b/...er/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithoutValueFilter.java
@@ -107,7 +107,6 @@ private void putExceptionBatchData(Exception e, String logMessage) {
         reader.setHasRemaining(false);
         blockingQueue.put(new ExceptionBatchData(e));
       } catch (InterruptedException ex) {
-        ex.printStackTrace();
         LOGGER.error("Interrupted while putting ExceptionBatchData into the blocking queue: ", ex);
         Thread.currentThread().interrupt();
       }
@@ -356,11 +355,11 @@ private void fillCache(int seriesIndex) throws IOException, InterruptedException
     } else if (batchData instanceof ExceptionBatchData) {
       // exception happened in producer thread
       ExceptionBatchData exceptionBatchData = (ExceptionBatchData) batchData;
-      LOGGER.error("exception happened in producer thread", exceptionBatchData.exception);
-      if (exceptionBatchData.exception instanceof IOException) {
-        throw (IOException)exceptionBatchData.exception;
-      } else if (exceptionBatchData.exception instanceof RuntimeException) {
-        throw (RuntimeException)exceptionBatchData.exception;
+      LOGGER.error("exception happened in producer thread", exceptionBatchData.getException());
+      if (exceptionBatchData.getException() instanceof IOException) {
+        throw (IOException)exceptionBatchData.getException();
+      } else if (exceptionBatchData.getException() instanceof RuntimeException) {
+        throw (RuntimeException)exceptionBatchData.getException();
       }
 
     } else {   // there are more batch data in this time series queue

diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/ExceptionBatchData.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/ExceptionBatchData.java
@@ -20,7 +20,7 @@
 
 public class ExceptionBatchData extends BatchData {
 
-  public Exception exception;
+  private Exception exception;
 
   public ExceptionBatchData(Exception exception) {
     this.exception = exception;
@@ -30,4 +30,8 @@ public ExceptionBatchData(Exception exception) {
   public boolean hasCurrent() {
     throw new UnsupportedOperationException("hasCurrent is not supported for ExceptionBatchData");
   }
+
+  public Exception getException() {
+    return exception;
+  }
 }