From 0b92907149e20dcd014bb4889b6afddf82d864ef Mon Sep 17 00:00:00 2001 From: Martin Mohr Date: Thu, 25 Jun 2015 09:08:13 +0200 Subject: [PATCH] Revert "cache for selectors" This reverts commit 0af7f105ecf4ef28d71b5ce03f7a2dd02c56ba7f. --- .../src/com/ibm/wala/types/Selector.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/com.ibm.wala.core/src/com/ibm/wala/types/Selector.java b/com.ibm.wala.core/src/com/ibm/wala/types/Selector.java index febcb0de7..2275919cb 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/types/Selector.java +++ b/com.ibm.wala.core/src/com/ibm/wala/types/Selector.java @@ -10,9 +10,6 @@ *******************************************************************************/ package com.ibm.wala.types; -import java.util.HashMap; -import java.util.Map; - import com.ibm.wala.classLoader.Language; import com.ibm.wala.util.strings.Atom; @@ -27,17 +24,8 @@ public final class Selector { private final Descriptor descriptor; - private final String s; - - private static final Map CACHE = new HashMap(); - public static Selector make(String selectorStr) { - Selector ret = CACHE.get(selectorStr); - if (ret == null) { - ret = make(Language.JAVA, selectorStr); - CACHE.put(selectorStr, ret); - } - return ret; + return make(Language.JAVA, selectorStr); } public static Selector make(Language l, String selectorStr) { @@ -56,7 +44,6 @@ public final class Selector { public Selector(Atom name, Descriptor descriptor) { this.name = name; this.descriptor = descriptor; - this.s = name.toString() + descriptor.toString(); if (name == null) { throw new IllegalArgumentException("null name"); } @@ -83,7 +70,7 @@ public final class Selector { @Override public String toString() { - return s; + return name.toString() + descriptor.toString(); } public Descriptor getDescriptor() {