You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2017/10/16 20:05:08 UTC
[2/3] incubator-trafodion git commit: change exception to concrete
exception
change exception to concrete exception
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7b54d0e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7b54d0e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7b54d0e5
Branch: refs/heads/master
Commit: 7b54d0e5955e3311a10dc85d1b9893d1d2a63cd0
Parents: 3b9cb97
Author: mashengchen <ma...@gmail.com>
Authored: Mon Oct 16 04:09:57 2017 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Oct 16 04:09:57 2017 +0000
----------------------------------------------------------------------
.../java/org/trafodion/dcs/master/listener/ListenerWorker.java | 1 +
.../org/trafodion/dcs/master/listener/RequestCancelQuery.java | 4 ++--
.../org/trafodion/dcs/master/listener/RequestGetObjectRef.java | 4 ++--
.../java/org/trafodion/dcs/master/listener/RequestUnknown.java | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7b54d0e5/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerWorker.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerWorker.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerWorker.java
index 3683618..95fba59 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerWorker.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerWorker.java
@@ -122,6 +122,7 @@ public class ListenerWorker extends Thread {
server.send(new PendingRequest(key, requestReply));
} catch (Exception e){
LOG.error("Unexpected Exception", e);
+ System.exit(-1);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7b54d0e5/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestCancelQuery.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestCancelQuery.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestCancelQuery.java
index da6040a..74944c1 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestCancelQuery.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestCancelQuery.java
@@ -199,9 +199,9 @@ public class RequestCancelQuery {
if(LOG.isErrorEnabled())
LOG.error("RequestCancelQuery.InterruptedException: " + s.getRemoteSocketAddress() + ": " + ie.getMessage(), ie);
cancelConnection = true;
- } catch (Exception e){
+ } catch (BufferUnderflowException e){
if(LOG.isErrorEnabled())
- LOG.error("RequestCancelQuery.Exception: " + s.getRemoteSocketAddress() + ": " + e.getMessage(), e);
+ LOG.error("RequestCancelQuery.BufferUnderflowException: " + s.getRemoteSocketAddress() + ": " + e.getMessage(), e);
cancelConnection = true;
}
header = null;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7b54d0e5/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestGetObjectRef.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestGetObjectRef.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestGetObjectRef.java
index 62f9d99..99abf85 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestGetObjectRef.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestGetObjectRef.java
@@ -63,9 +63,9 @@ public class RequestGetObjectRef {
if(LOG.isErrorEnabled())
LOG.error("IOException in RequestGetObjectRef: " + s.getRemoteSocketAddress() + ": " + io.getMessage(), io);
cancelConnection = true;
- } catch (Exception e){
+ } catch (BufferUnderflowException e){
if(LOG.isErrorEnabled())
- LOG.error("Exception in RequestGetObjectRef: " + s.getRemoteSocketAddress() + ": " + e.getMessage(), e);
+ LOG.error("BufferUnderflowException in RequestGetObjectRef: " + s.getRemoteSocketAddress() + ": " + e.getMessage(), e);
cancelConnection = true;
}
// Return to sender
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7b54d0e5/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestUnknown.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestUnknown.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestUnknown.java
index 1e5e566..122429f 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestUnknown.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestUnknown.java
@@ -78,9 +78,9 @@ public class RequestUnknown {
if(LOG.isErrorEnabled())
LOG.error("UnsupportedEncodingException in RequestUnknown: " + s.getRemoteSocketAddress() + ": " + ue.getMessage(), ue);
cancelConnection = true;
- } catch (Exception e){
+ } catch (BufferUnderflowException e){
if(LOG.isErrorEnabled())
- LOG.error("Exception in RequestUnknown: " + s.getRemoteSocketAddress() + ": " + e.getMessage(), e);
+ LOG.error("BufferUnderflowException in RequestUnknown: " + s.getRemoteSocketAddress() + ": " + e.getMessage(), e);
cancelConnection = true;
}
header = null;