[incubator-hop] branch master updated: Catches should be combined

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git


The following commit(s) were added to refs/heads/master by this push:
     new 17af4de  Catches should be combined
     new 4aa7508  Merge pull request #1012 from nanthakumar1305/my-contribution
17af4de is described below

commit 17af4de181d5960a1c5676f2c5f08ea9cdaa5026
Author: nanthakumar1305 <na...@gmail.com>
AuthorDate: Tue Aug 24 19:58:57 2021 +0530

    Catches should be combined
---
 core/src/main/java/org/apache/hop/core/BlockingRowSet.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/src/main/java/org/apache/hop/core/BlockingRowSet.java b/core/src/main/java/org/apache/hop/core/BlockingRowSet.java
index c9398dc..53d0738 100644
--- a/core/src/main/java/org/apache/hop/core/BlockingRowSet.java
+++ b/core/src/main/java/org/apache/hop/core/BlockingRowSet.java
@@ -73,9 +73,7 @@ public class BlockingRowSet extends BaseRowSet implements Comparable<IRowSet>, I
     try {
 
       return queArray.offer( rowData, time, tu );
-    } catch ( InterruptedException e ) {
-      return false;
-    } catch ( NullPointerException e ) {
+    } catch ( InterruptedException | NullPointerException e ) {
       return false;
     }