Author: markt Date: Thu Oct 11 20:52:22 2012 New Revision: 1397302 URL: http://svn.apache.org/viewvc?rev=1397302&view=rev Log: Sync with trunk
Modified: tomcat/sandbox/trunk-resources/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java tomcat/sandbox/trunk-resources/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Modified: tomcat/sandbox/trunk-resources/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java?rev=1397302&r1=1397301&r2=1397302&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java (original) +++ tomcat/sandbox/trunk-resources/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java Thu Oct 11 20:52:22 2012 @@ -48,7 +48,7 @@ public class GzipInterceptor extends Cha byte[] data = compress(msg.getMessage().getBytes()); msg.getMessage().trim(msg.getMessage().getLength()); msg.getMessage().append(data,0,data.length); - getNext().sendMessage(destination, msg, payload); + super.sendMessage(destination, msg, payload); } catch ( IOException x ) { log.error("Unable to compress byte contents"); throw new ChannelException(x); @@ -61,7 +61,7 @@ public class GzipInterceptor extends Cha byte[] data = decompress(msg.getMessage().getBytes()); msg.getMessage().trim(msg.getMessage().getLength()); msg.getMessage().append(data,0,data.length); - getPrevious().messageReceived(msg); + super.messageReceived(msg); } catch ( IOException x ) { log.error("Unable to decompress byte contents",x); } Modified: tomcat/sandbox/trunk-resources/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1397302&r1=1397301&r2=1397302&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original) +++ tomcat/sandbox/trunk-resources/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Thu Oct 11 20:52:22 2012 @@ -623,7 +623,10 @@ public abstract class AbstractReplicated MapEntry<K,V> entry = innerMap.get(mapmsg.getKey()); if ( entry==null ) { entry = new MapEntry<>((K) mapmsg.getKey(), (V) mapmsg.getValue()); - entry = innerMap.putIfAbsent(entry.getKey(), entry); + MapEntry<K,V> old = innerMap.putIfAbsent(entry.getKey(), entry); + if (old != null) { + entry = old; + } } entry.setProxy(true); entry.setBackup(false); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org