--- old/src/com/sun/javatest/exec/ExecToolManager.java	2018-06-19 01:09:56.000000000 +0100
+++ new/src/com/sun/javatest/exec/ExecToolManager.java	2018-06-19 01:09:56.000000000 +0100
@@ -302,7 +302,7 @@
         if (conManager != null  && conManager.getFeatureManager().isEnabled(
                         FeatureManager.SINGLE_TEST_MANAGER)) {
             Tool[] tools = d.getTools();
-            ArrayList list = new ArrayList();
+            ArrayList<Tool> list = new ArrayList<>();
             for (int i = 0; i < tools.length; i++) {
                 if (tools[i] instanceof ExecTool) {
                     ExecTool tool = (ExecTool) tools[i];
@@ -347,11 +347,11 @@
         }
 
         @Override
-        protected void save(Map m) {
+        protected void save(Map<String, String> m) {
         }
 
         @Override
-        protected void restore(Map m) {
+        protected void restore(Map<String, String> m) {
         }
 
     }