From 4485e22f73f11b32763cd6f85e06c6e63b86006f Mon Sep 17 00:00:00 2001 From: fhanik Date: Mon, 21 May 2007 13:32:46 +0000 Subject: [PATCH] Fix demo git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@540139 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java | 4 ++++ test/org/apache/catalina/tribes/demos/MapDemo.java | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java index fb953679b..2e097f50a 100644 --- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java +++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java @@ -767,6 +767,10 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements return entry!=null?entry.getValue():null; } + public MapEntry getInternal(Object key) { + return (MapEntry)super.get(key); + } + public Object get(Object key) { MapEntry entry = (MapEntry)super.get(key); if (log.isTraceEnabled()) log.trace("Requesting id:"+key+" entry:"+entry); diff --git a/test/org/apache/catalina/tribes/demos/MapDemo.java b/test/org/apache/catalina/tribes/demos/MapDemo.java index 0c00f1d51..aee1d5dba 100644 --- a/test/org/apache/catalina/tribes/demos/MapDemo.java +++ b/test/org/apache/catalina/tribes/demos/MapDemo.java @@ -48,6 +48,7 @@ import java.awt.Component; import javax.swing.table.TableColumn; import org.apache.catalina.tribes.util.UUIDGenerator; import org.apache.catalina.tribes.util.Arrays; +import java.util.Set; /** *

Title:

@@ -191,9 +192,9 @@ public class MapDemo implements ChannelListener, MembershipListener{ return ""; } if ( row == 0 ) return columnNames[col]; - Object[] entries = map.entrySetFull().toArray(); - Map.Entry e = (Map.Entry)entries [row-1]; - LazyReplicatedMap.MapEntry entry = (LazyReplicatedMap.MapEntry)e.getValue(); + Object[] keys = map.keySetFull().toArray(); + String key = (String)keys [row-1]; + LazyReplicatedMap.MapEntry entry = map.getInternal(key); switch (col) { case 0: return entry.getKey(); case 1: return entry.getValue(); @@ -329,7 +330,7 @@ public class MapDemo implements ChannelListener, MembershipListener{ public void run() { for (int i = 0; i < 100; i++) { String key = Arrays.toString(UUIDGenerator.randomUUID(false)); - map.put(key, key); + map.put(key, new StringBuffer(key)); dataModel.fireTableDataChanged(); table.paint(table.getGraphics()); try { -- 2.11.0