Author: fhanik
Date: Mon May 21 07:08:04 2007
New Revision: 540149
URL: http://svn.apache.org/viewvc?view=rev&rev=540149
Log:
forward port
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?view=diff&rev=540149&r1=540148&r2=540149
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Mon May 21 07:08:04 2007
@@ -767,6 +767,10 @@
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);
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java?view=diff&rev=540149&r1=540148&r2=540149
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java Mon May 21
07:08:04 2007
@@ -48,6 +48,7 @@
import javax.swing.table.TableColumn;
import org.apache.catalina.tribes.util.UUIDGenerator;
import org.apache.catalina.tribes.util.Arrays;
+import java.util.Set;
/**
* <p>Title: </p>
@@ -191,9 +192,9 @@
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 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 {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
