/* Soot - a J*va Optimization Framework
 * Copyright (C) 2002 Ondrej Lhotak
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */

package soot.util;
import java.util.HashMap;
import java.util.Map;

import heros.ThreadSafe;

/** A class that numbers strings, so they can be placed in bitsets.
 *
 * @author Ondrej Lhotak
 */

@ThreadSafe
public class StringNumberer extends ArrayNumberer<NumberedString> {
    private Map<String, NumberedString> stringToNumbered =
    		new HashMap<String, NumberedString>(1024);
    
    public synchronized NumberedString findOrAdd( String s ) {
            NumberedString ret = stringToNumbered.get(s);
            if( ret == null ) {
                ret = stringToNumbered.put(s, new NumberedString(s));
                add(ret);
            }
            return ret;
    }
}

@@ -1375,24 +1375,63 @@
        ret =
+ new NumberedString(s);%0A               
  stringToNum
@@ -1443,37 +1443,19 @@
 .put(s, 
-new NumberedString(s)
+ret
 );%0A     

Fix for previous commit.