1 files changed, 11 insertions, 9 deletions
diff --git a/src/main/javassist/compiler/KeywordTable.java b/src/main/javassist/compiler/KeywordTable.java
index 3a22a79..65137d9 100644
--- a/src/main/javassist/compiler/KeywordTable.java
+++ b/src/main/javassist/compiler/KeywordTable.java
@@ -1,11 +1,12 @@
 /*
  * Javassist, a Java-bytecode translator toolkit.
- * Copyright (C) 1999-2007 Shigeru Chiba. All Rights Reserved.
+ * Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License.  Alternatively, the contents of this file may be used under
- * the terms of the GNU Lesser General Public License Version 2.1 or later.
+ * the terms of the GNU Lesser General Public License Version 2.1 or later,
+ * or the Apache License Version 2.0.
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ -15,18 +16,19 @@
 
 package javassist.compiler;
 
-public final class KeywordTable extends java.util.HashMap {
+import java.util.HashMap;
+
+public final class KeywordTable extends HashMap<String,Integer> {
+    /** default serialVersionUID */
+    private static final long serialVersionUID = 1L;
+
     public KeywordTable() { super(); }
 
     public int lookup(String name) {
-        Object found = get(name);
-        if (found == null)
-            return -1;
-        else
-            return ((Integer)found).intValue();
+        return containsKey(name) ? get(name) : -1;
     }
 
     public void append(String name, int t) {
-        put(name, new Integer(t));
+        put(name, t);
     }
 }