src/share/classes/sun/rmi/server/ActivationGroupImpl.java

@@ -64,14 +64,14 @@
     // use serialVersionUID from JDK 1.2.2 for interoperability
     private static final long serialVersionUID = 5758693559430427303L;
 
     /** maps persistent IDs to activated remote objects */
     private final Hashtable<ActivationID,ActiveEntry> active =
-        new Hashtable<ActivationID,ActiveEntry>();
+        new Hashtable<>();
     private boolean groupInactive = false;
     private final ActivationGroupID groupID;
-    private final List<ActivationID> lockedIDs = new ArrayList<ActivationID>();
+    private final List<ActivationID> lockedIDs = new ArrayList<>();
 
     /**
      * Creates a default activation group implementation.
      *
      * @param id the group's identifier

@@ -294,18 +294,13 @@
 
             entry = new ActiveEntry(impl);
             active.put(id, entry);
             return entry.mobj;
 
-        } catch (NoSuchMethodException e) {
-            /* user forgot to provide activatable constructor? */
-            throw new ActivationException
-                ("Activatable object must provide an activation"+
-                 " constructor", e);
-
-        } catch (NoSuchMethodError e) {
-            /* code recompiled and user forgot to provide
+        } catch (NoSuchMethodException | NoSuchMethodError e) {
+            /* user forgot to provide activatable constructor? 
+             * or code recompiled and user forgot to provide
              *  activatable constructor?
              */
             throw new ActivationException
                 ("Activatable object must provide an activation"+
                  " constructor", e );