/hg/icedtea-web: 2 new changesets
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Tue Feb 15 08:01:49 PST 2011
changeset bf3431004829 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bf3431004829
author: Omair Majid <omajid at redhat.com>
date: Tue Feb 15 10:35:49 2011 -0500
Move TimedHashMap to netx
2011-02-15 Omair Majid <omajid at redhat.com>
* plugin/icedteanp/java/sun/applet/PluginProxySelector.java
(TimedHashMap): Moved to...
* netx/net/sourceforge/jnlp/util/TimedHashMap.java: New file.
changeset cd1eda4f0d97 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=cd1eda4f0d97
author: Omair Majid <omajid at redhat.com>
date: Tue Feb 15 11:01:01 2011 -0500
Small fixes to TimedHashMap
2011-02-15 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/util/TimedHashMap.java: Do not
extend HashMap to provide a more type-safe and consistent
interface. Use System.nanoTime for a more monotonic clock.
diffstat:
3 files changed, 113 insertions(+), 57 deletions(-)
ChangeLog | 12 +
netx/net/sourceforge/jnlp/util/TimedHashMap.java | 100 +++++++++++++
plugin/icedteanp/java/sun/applet/PluginProxySelector.java | 58 -------
diffs (200 lines):
diff -r c6f717dfcb97 -r cd1eda4f0d97 ChangeLog
--- a/ChangeLog Fri Feb 11 20:13:11 2011 -0500
+++ b/ChangeLog Tue Feb 15 11:01:01 2011 -0500
@@ -1,3 +1,15 @@ 2011-02-11 Omair Majid <omajid at redhat.
+2011-02-15 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/util/TimedHashMap.java: Do not extend HashMap
+ to provide a more type-safe and consistent interface. Use System.nanoTime
+ for a more monotonic clock.
+
+2011-02-15 Omair Majid <omajid at redhat.com>
+
+ * plugin/icedteanp/java/sun/applet/PluginProxySelector.java
+ (TimedHashMap): Moved to...
+ * netx/net/sourceforge/jnlp/util/TimedHashMap.java: New file.
+
2011-02-11 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/PluginBridge.java
diff -r c6f717dfcb97 -r cd1eda4f0d97 netx/net/sourceforge/jnlp/util/TimedHashMap.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/util/TimedHashMap.java Tue Feb 15 11:01:01 2011 -0500
@@ -0,0 +1,100 @@
+/* TimedHashMap.java
+ Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package net.sourceforge.jnlp.util;
+
+import java.util.HashMap;
+
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+
+/**
+ * Simple utility class that extends HashMap by adding an expiry to the entries.
+ *
+ * This map stores entries, and returns them only if the entries were last accessed within time t=10 seconds
+ *
+ * @param K The key type
+ * @param V The Object type
+ */
+public class TimedHashMap<K, V> {
+
+ HashMap<K,V> actualMap = new HashMap<K,V>();
+ HashMap<K, Long> timeStamps = new HashMap<K, Long>();
+ Long expiry = 10000000000L;
+
+ /**
+ * Store the item in the map and associate a timestamp with it
+ *
+ * @param key The key
+ * @param value The value to store
+ */
+ public V put(K key, V value) {
+ timeStamps.put(key, System.nanoTime());
+ return actualMap.put(key, value);
+ }
+
+ /**
+ * Return cached item if it has not already expired.
+ *
+ * Before returning, this method also resets the "last accessed"
+ * time for this entry, so it is good for another 10 seconds
+ *
+ * @param key The key
+ */
+ public V get(K key) {
+ Long now = System.nanoTime();
+
+ if (actualMap.containsKey(key)) {
+ Long age = now - timeStamps.get(key);
+
+ // Item exists. If it has not expired, renew its access time and return it
+ if (age <= expiry) {
+ if (JNLPRuntime.isDebug()) {
+ System.err.println("Returning proxy " + actualMap.get(key) + " from cache for " + key);
+ }
+ timeStamps.put(key, System.nanoTime());
+ return actualMap.get(key);
+ } else {
+ if (JNLPRuntime.isDebug()) {
+ System.err.println("Proxy cache for " + key + " has expired (age=" + (age * 1e-9) + " seconds)");
+ }
+ }
+ }
+
+ return null;
+ }
+}
+
diff -r c6f717dfcb97 -r cd1eda4f0d97 plugin/icedteanp/java/sun/applet/PluginProxySelector.java
--- a/plugin/icedteanp/java/sun/applet/PluginProxySelector.java Fri Feb 11 20:13:11 2011 -0500
+++ b/plugin/icedteanp/java/sun/applet/PluginProxySelector.java Tue Feb 15 11:01:01 2011 -0500
@@ -40,12 +40,11 @@ import java.net.InetSocketAddress;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.URI;
-import java.util.Date;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import net.sourceforge.jnlp.runtime.JNLPProxySelector;
+import net.sourceforge.jnlp.util.TimedHashMap;
/**
* Proxy selector implementation for plugin network functions.
@@ -129,59 +128,4 @@ public class PluginProxySelector extends
return null;
}
- /**
- * Simple utility class that extends HashMap by adding an expiry to the entries.
- *
- * This map stores entries, and returns them only if the entries were last accessed within time t=10 seconds
- *
- * @param <K> The key type
- * @param <V> The Object type
- */
-
- private class TimedHashMap<K, V> extends HashMap<K, V> {
-
- HashMap<K, Long> timeStamps = new HashMap<K, Long>();
- Long expiry = 10000L;
-
- /**
- * Store the item in the map and associate a timestamp with it
- *
- * @param key The key
- * @param value The value to store
- */
- public V put(K key, V value) {
- timeStamps.put(key, new Date().getTime());
- return super.put(key, value);
- }
-
- /**
- * Return cached item if it has not already expired.
- *
- * Before returning, this method also resets the "last accessed"
- * time for this entry, so it is good for another 10 seconds
- *
- * @param key The key
- */
- @SuppressWarnings("unchecked")
- public V get(Object key) {
-
- Long now = new Date().getTime();
-
- if (super.containsKey(key)) {
- Long age = now - timeStamps.get(key);
-
- // Item exists. If it has not expired, renew its access time and return it
- if (age <= expiry) {
- PluginDebug.debug("Returning proxy " + super.get(key) + " from cache for " + key);
- timeStamps.put((K) key, (new Date()).getTime());
- return super.get(key);
- } else {
- PluginDebug.debug("Proxy cache for " + key + " has expired (age=" + age / 1000.0 + " seconds)");
- }
- }
-
- return null;
- }
- }
-
}
More information about the distro-pkg-dev
mailing list