diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | netx/net/sourceforge/jnlp/util/TimedHashMap.java | 102 | ||||
| -rw-r--r-- | plugin/icedteanp/java/sun/applet/PluginProxySelector.java | 58 |
3 files changed, 109 insertions, 57 deletions
@@ -1,3 +1,9 @@ +2011-02-15 Omair Majid <[email protected]> + + * plugin/icedteanp/java/sun/applet/PluginProxySelector.java + (TimedHashMap): Moved to... + * netx/net/sourceforge/jnlp/util/TimedHashMap.java: New file. + 2011-02-11 Omair Majid <[email protected]> * netx/net/sourceforge/jnlp/PluginBridge.java diff --git a/netx/net/sourceforge/jnlp/util/TimedHashMap.java b/netx/net/sourceforge/jnlp/util/TimedHashMap.java new file mode 100644 index 0000000..403378b --- /dev/null +++ b/netx/net/sourceforge/jnlp/util/TimedHashMap.java @@ -0,0 +1,102 @@ +/* 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.Date; +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> 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) { + if (JNLPRuntime.isDebug()) { + System.err.println("Returning proxy " + super.get(key) + " from cache for " + key); + } + timeStamps.put((K) key, (new Date()).getTime()); + return super.get(key); + } else { + if (JNLPRuntime.isDebug()) { + System.err.println("Proxy cache for " + key + " has expired (age=" + age / 1000.0 + " seconds)"); + } + } + } + + return null; + } +} diff --git a/plugin/icedteanp/java/sun/applet/PluginProxySelector.java b/plugin/icedteanp/java/sun/applet/PluginProxySelector.java index dc716f7..735c918 100644 --- a/plugin/icedteanp/java/sun/applet/PluginProxySelector.java +++ b/plugin/icedteanp/java/sun/applet/PluginProxySelector.java @@ -40,12 +40,11 @@ package sun.applet; 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 JNLPProxySelector { 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; - } - } - } |