[MMBASE CVS] applications/clustering/src/org/mmbase/clustering/multicast ChangesReceiver.java Multicast.java

[Michiel Meeuwissen]

Update of /var/cvs/applications/clustering/src/org/mmbase/clustering/multicast
In directory james.mmbase.org:/tmp/cvs-serv21233/multicast

Modified Files:
        ChangesReceiver.java Multicast.java 
Log Message:
  MMB-1691


See also: 
http://cvs.mmbase.org/viewcvs/applications/clustering/src/org/mmbase/clustering/multicast
See also: http://www.mmbase.org/jira/browse/MMB-1691


Index: ChangesReceiver.java
===================================================================
RCS file: 
/var/cvs/applications/clustering/src/org/mmbase/clustering/multicast/ChangesReceiver.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- ChangesReceiver.java        9 May 2008 11:33:54 -0000       1.16
+++ ChangesReceiver.java        22 Jul 2008 15:05:51 -0000      1.17
@@ -23,7 +23,7 @@
  * @author Daniel Ockeloen
  * @author Rico Jansen
  * @author Nico Klasens
- * @version $Id: ChangesReceiver.java,v 1.16 2008/05/09 11:33:54 nklasens Exp $
+ * @version $Id: ChangesReceiver.java,v 1.17 2008/07/22 15:05:51 michiel Exp $
  */
 public class ChangesReceiver implements Runnable {
 
@@ -69,7 +69,7 @@
                 ms = new MulticastSocket(mport);
                 ms.joinGroup(ia);
             } catch(Exception e) {
-                log.error(Logging.stackTrace(e));
+                log.error(e.getMessage(), e);
             }
             if (ms != null) {
                 kicker = MMBaseContext.startThread(this, "MulticastReceiver");
@@ -88,7 +88,6 @@
             // nothing
         }
         if (kicker != null) {
-            kicker.setPriority(Thread.MIN_PRIORITY);
             kicker.interrupt();
             kicker = null;
         } else {


Index: Multicast.java
===================================================================
RCS file: 
/var/cvs/applications/clustering/src/org/mmbase/clustering/multicast/Multicast.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- Multicast.java      9 May 2008 11:33:54 -0000       1.13
+++ Multicast.java      22 Jul 2008 15:05:51 -0000      1.14
@@ -25,7 +25,7 @@
  * @author Daniel Ockeloen
  * @author Rico Jansen
  * @author Nico Klasens
- * @version $Id: Multicast.java,v 1.13 2008/05/09 11:33:54 nklasens Exp $
+ * @version $Id: Multicast.java,v 1.14 2008/07/22 15:05:51 michiel Exp $
  */
 public class Multicast extends ClusterManager {
 
@@ -118,6 +118,9 @@
     }
 
     protected synchronized void startCommunicationThreads() {
+        if (multicastPort == -1) {
+            log.service("Not starting multicast threads because port number 
configured to be -1");
+        } else {
         try {
             mcs = new ChangesSender(multicastHost, multicastPort, 
multicastTTL, nodesToSend, send);
         } catch (java.net.UnknownHostException e) {
@@ -129,6 +132,7 @@
             log.error(e);
         }
     }
+    }
 
     protected synchronized void stopCommunicationThreads() {
         if (mcs != null) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs