Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 908AB922B for ; Sat, 31 Mar 2012 19:03:25 +0000 (UTC) Received: (qmail 82890 invoked by uid 500); 31 Mar 2012 19:03:24 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 82820 invoked by uid 500); 31 Mar 2012 19:03:24 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 82812 invoked by uid 99); 31 Mar 2012 19:03:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 Mar 2012 19:03:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 Mar 2012 19:03:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6E75B238890B for ; Sat, 31 Mar 2012 19:03:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1307877 - /commons/proper/jcs/branches/generics-interface/src/java/org/apache/jcs/utils/discovery/UDPDiscoveryReceiver.java Date: Sat, 31 Mar 2012 19:03:01 -0000 To: commits@commons.apache.org From: tv@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120331190301.6E75B238890B@eris.apache.org> Author: tv Date: Sat Mar 31 19:03:01 2012 New Revision: 1307877 URL: http://svn.apache.org/viewvc?rev=1307877&view=rev Log: Apply patch to fix JCS-89 Modified: commons/proper/jcs/branches/generics-interface/src/java/org/apache/jcs/utils/discovery/UDPDiscoveryReceiver.java Modified: commons/proper/jcs/branches/generics-interface/src/java/org/apache/jcs/utils/discovery/UDPDiscoveryReceiver.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/generics-interface/src/java/org/apache/jcs/utils/discovery/UDPDiscoveryReceiver.java?rev=1307877&r1=1307876&r2=1307877&view=diff ============================================================================== --- commons/proper/jcs/branches/generics-interface/src/java/org/apache/jcs/utils/discovery/UDPDiscoveryReceiver.java (original) +++ commons/proper/jcs/branches/generics-interface/src/java/org/apache/jcs/utils/discovery/UDPDiscoveryReceiver.java Sat Mar 31 19:03:01 2012 @@ -166,9 +166,18 @@ public class UDPDiscoveryReceiver final ObjectInputStream objectStream = new ObjectInputStream( byteStream ); obj = objectStream.readObject(); - if ( log.isDebugEnabled() ) + if ( (obj != null) && (obj instanceof UDPDiscoveryMessage) ) { - log.debug( "Read object from address [" + packet.getSocketAddress() + "], object=[" + obj + "]" ); + // Ensure that the address we're supposed to send to is, indeed, the address + // of the machine on the other end of this connection. This guards against + // instances where we don't exactly get the right local host address + UDPDiscoveryMessage msg = (UDPDiscoveryMessage) obj; + msg.setHost(packet.getAddress().getHostAddress()); + + if ( log.isDebugEnabled() ) + { + log.debug( "Read object from address [" + packet.getSocketAddress() + "], object=[" + obj + "]" ); + } } } catch ( Exception e )