CVS update: JGroups/src/org/jgroups/protocols ENCRYPT.java

  User: belaban 
  Date: 10/09/29 14:25:46

  Modified:    src/org/jgroups/protocols Tag: Branch_JGroups_2_10
                        ENCRYPT.java
  Log:
  fixed bug which caused messages with length == 0 *not* to get encrypted although encrypt_entire_message was set to true (https://jira.jboss.org/browse/JGRP-1242)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.59.2.1  +3 -3      JGroups/src/org/jgroups/protocols/ENCRYPT.java
  
  Index: ENCRYPT.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/protocols/ENCRYPT.java,v
  retrieving revision 1.59
  retrieving revision 1.59.2.1
  diff -u -r1.59 -r1.59.2.1
  --- ENCRYPT.java	15 Jun 2010 06:44:35 -0000	1.59
  +++ ENCRYPT.java	29 Sep 2010 14:25:46 -0000	1.59.2.1
  @@ -1,4 +1,4 @@
  -// $Id: ENCRYPT.java,v 1.59 2010/06/15 06:44:35 belaban Exp $
  +// $Id: ENCRYPT.java,v 1.59.2.1 2010/09/29 14:25:46 belaban Exp $
   
   package org.jgroups.protocols;
   
  @@ -512,7 +512,7 @@
               return;
           }
   
  -        if(msg.getLength() == 0) {
  +        if(msg.getLength() == 0 && !encrypt_entire_message) {
               passItUp(evt);
               return;
           }
  @@ -879,7 +879,7 @@
           }
   
           Message msg=(Message)evt.getArg();
  -        if(msg.getLength() == 0) {
  +        if(msg.getLength() == 0 && !encrypt_entire_message) {
               passItDown(evt);
               return;
           }
  
  
  

------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev