Author: fhanik
Date: Wed Apr 23 04:12:23 2008
New Revision: 650826
URL: http://svn.apache.org/viewvc?rev=650826&view=rev
Log:
notify user of the actual error and add a todo behavior for buffer copying
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=650826&r1=650825&r2=650826&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Wed Apr 23 04:12:23 2008
@@ -230,7 +230,12 @@
boolean valid = false;
if ( (level & Channel.MBR_RX_SEQ)==Channel.MBR_RX_SEQ ) {
if ( receiver != null ) throw new
IllegalStateException("McastService.receive already running.");
- if ( sender == null ) socket.joinGroup(address);
+ try {
+ if ( sender == null ) socket.joinGroup(address);
+ }catch (IOException iox) {
+ log.error("Unable to join multicast group, make sure your
system has multicasting enabled.");
+ throw iox;
+ }
doRunReceiver = true;
receiver = new ReceiverThread();
receiver.setDaemon(true);
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java?rev=650826&r1=650825&r2=650826&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
Wed Apr 23 04:12:23 2008
@@ -338,6 +338,8 @@
if ( writebuf != null ) writebuf.clear();
else writebuf = getBuffer(length);
if ( writebuf.capacity() < length ) writebuf = getBuffer(length);
+
+ //TODO use ByteBuffer.wrap to avoid copying the data.
writebuf.put(data,offset,length);
//writebuf.rewind();
//set the limit so that we don't write non wanted data
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
