From e8106c0f29d9e6d4ce0a427f46b54a9eaca16def Mon Sep 17 00:00:00 2001 From: fhanik Date: Wed, 22 Aug 2007 20:19:54 +0000 Subject: [PATCH] backport from trunk git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@568742 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/tribes/group/GroupChannel.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java b/java/org/apache/catalina/tribes/group/GroupChannel.java index 6569b3b6d..00e4f3931 100644 --- a/java/org/apache/catalina/tribes/group/GroupChannel.java +++ b/java/org/apache/catalina/tribes/group/GroupChannel.java @@ -248,7 +248,12 @@ public class GroupChannel extends ChannelInterceptorBase implements ManagedChann if ( (msg.getOptions() & SEND_OPTIONS_BYTE_MESSAGE) == SEND_OPTIONS_BYTE_MESSAGE ) { fwd = new ByteMessage(msg.getMessage().getBytes()); } else { - fwd = XByteBuffer.deserialize(msg.getMessage().getBytesDirect(),0,msg.getMessage().getLength()); + try { + fwd = XByteBuffer.deserialize(msg.getMessage().getBytesDirect(), 0, msg.getMessage().getLength()); + }catch (Exception sx) { + log.error("Unable to deserialize message:"+msg,sx); + return; + } } if ( Logs.MESSAGES.isTraceEnabled() ) { Logs.MESSAGES.trace("GroupChannel - Receive Message:" + new UniqueId(msg.getUniqueId()) + " is " +fwd); @@ -278,8 +283,10 @@ public class GroupChannel extends ChannelInterceptorBase implements ManagedChann } } catch ( Exception x ) { - if ( log.isDebugEnabled() ) log.error("Unable to process channel:IOException.",x); - throw new RemoteProcessException("IOException:"+x.getMessage(),x); + //this could be the channel listener throwing an exception, we should log it + //as a warning. + if ( log.isWarnEnabled() ) log.warn("Error receiving message:",x); + throw new RemoteProcessException("Exception:"+x.getMessage(),x); } } -- 2.11.0