Merge pull request jpos#16 from vsalaman/cci001

Gets rid of command cache
maristo · Sep 26, 2012 · 58ad0a8 · 58ad0a8
2 parents 794dbb5 + 5915576
commit 58ad0a8
Showing 1 changed file with 2 additions and 19 deletions.
diff --git a/jpos/src/main/java/org/jpos/q2/CLICommandInterface.java b/jpos/src/main/java/org/jpos/q2/CLICommandInterface.java
@@ -9,13 +9,11 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
-import java.util.WeakHashMap;
 
 public class CLICommandInterface
 {
     CLIContext ctx;
     List<String> prefixes = new ArrayList<String>();
-    WeakHashMap<String, Object> commandCache = new WeakHashMap<String, Object>(100);
 
     public List<String> getPrefixes()
     {
@@ -88,23 +86,8 @@ else if (cmd instanceof CLICommand)
 
     private Object getCommand(String className) throws ClassNotFoundException, InstantiationException, IllegalAccessException
     {
-        Object cmd = commandCache.get(className);
-        if (cmd == null)
-        {
-            Class<?> clazz = getClazz(className);
-            final Object o = clazz.newInstance();
-            if (o instanceof Command || o instanceof CLICommand)
-            {
-                commandCache.put(className, o);
-                cmd = o;
-            }
-        }
-        return cmd;
-    }
-
-    private Class<?> getClazz(String className) throws ClassNotFoundException
-    {
-        return Thread.currentThread().getContextClassLoader().loadClass(className);
+        final ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        return cl.loadClass(className).newInstance();
     }
 
     private String[] parseCommand(String line) throws IOException